Skip to content

Remove namedtuple workaround #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gvanrossum merged 5 commits into from
Aug 17, 2016
Merged

Remove namedtuple workaround #479

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
faba480
Add stubs for dis and opcode
elazarg Jul 4, 2016
8d44dd7
pep8-ing and precision
elazarg Jul 5, 2016
695aa77
fix issue ref, trailing space
elazarg Jul 5, 2016
8a704e7
Merge remote-tracking branch 'upstream/master'
elazarg Aug 16, 2016
fba6186
remove NamedTuple workaround
elazarg Aug 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions stdlib/3/dis.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from typing import (List, Union, Iterator, Iterable, Tuple, Optional, Dict,
Any, IO, NamedTuple)
from typing import List, Union, Iterator, Tuple, Optional, Any, IO, NamedTuple

from opcode import (hasconst, hasname, hasjrel, hasjabs, haslocal, hascompare,
hasfree, hasnargs, cmp_op, opname , opmap , HAVE_ARGUMENT,
Expand All @@ -11,7 +10,7 @@ _have_code = Union[types.MethodType, types.FunctionType, types.CodeType, type]
_have_code_or_string = Union[_have_code, str, bytes]


class Instruction(NamedTuple("Instruction", [
Instruction = NamedTuple("Instruction", [
('opname', str),
('opcode', int),
('arg', Optional[int]),
Expand All @@ -20,18 +19,7 @@ class Instruction(NamedTuple("Instruction", [
('offset', int),
('starts_line', Optional[int]),
('is_jump_target', bool)
])):
# ad-hoc - seems to be an error in the NamedTuple type hint
# TODO: mypy issue #1076
_fields = ... # type: List[str]
_source = ... # type: str
def _replace(self, *, opname: str = ..., opcode: int = ...,
arg: Optional[int] = ..., argval: Any = ..., argrepr: str = ...,
offset: int = ..., starts_line: Optional[int] = ...,
is_jump_target: bool = ...) -> Instruction: ...
def _asdict(self) -> Dict[str, Any]: ...
@staticmethod
def _make(iterable: Iterable[Any]) -> Instruction: ...
])


# if sys.version_info >= (3, 4):
Expand Down