Skip to content

Use collections.abc.Reversible if it exists #194

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 9 commits into from
Apr 4, 2016
+34 −17
Merged

Use collections.abc.Reversible if it exists #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
87abf9c
Merge pull request #3 from python/master
ilevkivskyi Mar 24, 2016
478def2
Reversible references collections.abc.Reversible
ilevkivskyi Mar 24, 2016
342bdf5
Fix a typo
ilevkivskyi Mar 24, 2016
9b22d89
Merge pull request #5 from python/master
ilevkivskyi Apr 3, 2016
450c814
Use reversible abc also in python2 if it exists
ilevkivskyi Apr 3, 2016
6c7f682
Update proptocol tests
ilevkivskyi Apr 3, 2016
39751b5
update python2 tests
ilevkivskyi Apr 3, 2016
1f88314
fix python2 syntax for extra
ilevkivskyi Apr 3, 2016
4e9e36a
fixed annotation syntax for python2
ilevkivskyi Apr 3, 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
2 changes: 1 addition & 1 deletion python2/test_typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ def test_reversible(self):

def test_protocol_instance_type_error(self):
with self.assertRaises(TypeError):
isinstance([], typing.Reversible)
isinstance(0, typing.SupportsAbs)


class GenericTests(TestCase):
Expand Down
23 changes: 16 additions & 7 deletions python2/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1363,12 +1363,17 @@ def __abs__(self):
pass


class Reversible(_Protocol[T_co]):
__slots__ = ()
if hasattr(collections_abc, 'Reversible'):
class Reversible(Iterable[T_co]):
__slots__ = ()
__extra__ = collections_abc.Reversible
else:
class Reversible(_Protocol[T_co]):
__slots__ = ()

@abstractmethod
def __reversed__(self):
pass
@abstractmethod
def __reversed__(self):
pass


Sized = collections_abc.Sized # Not generic.
Expand Down Expand Up @@ -1399,8 +1404,12 @@ class MutableMapping(Mapping[KT, VT]):
__extra__ = collections_abc.MutableMapping


class Sequence(Sized, Iterable[T_co], Container[T_co]):
__extra__ = collections_abc.Sequence
if hasattr(collections_abc, 'Reversible'):
class Sequence(Sized, Reversible[T_co], Container[T_co]):
__extra__ = collections_abc.Sequence
else:
class Sequence(Sized, Iterable[T_co], Container[T_co]):
__extra__ = collections_abc.Sequence


class MutableSequence(Sequence[T]):
Expand Down
2 changes: 1 addition & 1 deletion src/test_typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ def test_reversible(self):

def test_protocol_instance_type_error(self):
with self.assertRaises(TypeError):
isinstance([], typing.Reversible)
isinstance(0, typing.SupportsAbs)


class GenericTests(TestCase):
Expand Down
24 changes: 16 additions & 8 deletions src/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1378,12 +1378,16 @@ def __round__(self, ndigits: int = 0) -> T_co:
pass


class Reversible(_Protocol[T_co]):
__slots__ = ()
if hasattr(collections_abc, 'Reversible'):
class Reversible(Iterable[T_co], extra=collections_abc.Reversible):
__slots__ = ()
else:
class Reversible(_Protocol[T_co]):
__slots__ = ()

@abstractmethod
def __reversed__(self) -> 'Iterator[T_co]':
pass
@abstractmethod
def __reversed__(self) -> 'Iterator[T_co]':
pass


Sized = collections_abc.Sized # Not generic.
Expand Down Expand Up @@ -1414,10 +1418,14 @@ class Mapping(Sized, Iterable[KT], Container[KT], Generic[VT_co],
class MutableMapping(Mapping[KT, VT], extra=collections_abc.MutableMapping):
pass


class Sequence(Sized, Iterable[T_co], Container[T_co],
if hasattr(collections_abc, 'Reversible'):
class Sequence(Sized, Reversible[T_co], Container[T_co],
extra=collections_abc.Sequence):
pass
pass
else:
class Sequence(Sized, Iterable[T_co], Container[T_co],
extra=collections_abc.Sequence):
pass


class MutableSequence(Sequence[T], extra=collections_abc.MutableSequence):
Expand Down