From 6baf64c4311578a9b8bcc73ae8986ce504f9fe1b Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Thu, 16 Dec 2021 12:03:11 +0000
Subject: [PATCH] `dis`: rename private-to-typeshed aliases (#6598)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 stdlib/dis.pyi | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/stdlib/dis.pyi b/stdlib/dis.pyi
index a6ea3e950..ac0632d25 100644
--- a/stdlib/dis.pyi
+++ b/stdlib/dis.pyi
@@ -20,8 +20,8 @@ from typing import IO, Any, Callable, Iterator, NamedTuple, Union
 
 # Strictly this should not have to include Callable, but mypy doesn't use FunctionType
 # for functions (python/mypy#3171)
-_have_code = Union[types.MethodType, types.FunctionType, types.CodeType, type, Callable[..., Any]]
-_have_code_or_string = Union[_have_code, str, bytes]
+_HaveCodeType = Union[types.MethodType, types.FunctionType, types.CodeType, type, Callable[..., Any]]
+_HaveCodeOrStringType = Union[_HaveCodeType, str, bytes]
 
 class Instruction(NamedTuple):
     opname: str
@@ -36,7 +36,7 @@ class Instruction(NamedTuple):
 class Bytecode:
     codeobj: types.CodeType
     first_line: int
-    def __init__(self, x: _have_code_or_string, *, first_line: int | None = ..., current_offset: int | None = ...) -> None: ...
+    def __init__(self, x: _HaveCodeOrStringType, *, first_line: int | None = ..., current_offset: int | None = ...) -> None: ...
     def __iter__(self) -> Iterator[Instruction]: ...
     def __repr__(self) -> str: ...
     def info(self) -> str: ...
@@ -46,19 +46,19 @@ class Bytecode:
 
 COMPILER_FLAG_NAMES: dict[int, str]
 
-def findlabels(code: _have_code) -> list[int]: ...
-def findlinestarts(code: _have_code) -> Iterator[tuple[int, int]]: ...
+def findlabels(code: _HaveCodeType) -> list[int]: ...
+def findlinestarts(code: _HaveCodeType) -> Iterator[tuple[int, int]]: ...
 def pretty_flags(flags: int) -> str: ...
-def code_info(x: _have_code_or_string) -> str: ...
+def code_info(x: _HaveCodeOrStringType) -> str: ...
 
 if sys.version_info >= (3, 7):
-    def dis(x: _have_code_or_string | None = ..., *, file: IO[str] | None = ..., depth: int | None = ...) -> None: ...
+    def dis(x: _HaveCodeOrStringType | None = ..., *, file: IO[str] | None = ..., depth: int | None = ...) -> None: ...
 
 else:
-    def dis(x: _have_code_or_string | None = ..., *, file: IO[str] | None = ...) -> None: ...
+    def dis(x: _HaveCodeOrStringType | None = ..., *, file: IO[str] | None = ...) -> None: ...
 
 def distb(tb: types.TracebackType | None = ..., *, file: IO[str] | None = ...) -> None: ...
-def disassemble(co: _have_code, lasti: int = ..., *, file: IO[str] | None = ...) -> None: ...
-def disco(co: _have_code, lasti: int = ..., *, file: IO[str] | None = ...) -> None: ...
-def show_code(co: _have_code, *, file: IO[str] | None = ...) -> None: ...
-def get_instructions(x: _have_code, *, first_line: int | None = ...) -> Iterator[Instruction]: ...
+def disassemble(co: _HaveCodeType, lasti: int = ..., *, file: IO[str] | None = ...) -> None: ...
+def disco(co: _HaveCodeType, lasti: int = ..., *, file: IO[str] | None = ...) -> None: ...
+def show_code(co: _HaveCodeType, *, file: IO[str] | None = ...) -> None: ...
+def get_instructions(x: _HaveCodeType, *, first_line: int | None = ...) -> Iterator[Instruction]: ...