Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add typing.Counter and typing.ChainMap #366

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
merged 9 commits into from
Feb 10, 2017
Merged

Add typing.Counter and typing.ChainMap #366

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3ae6137
Add typing.Counter
JelleZijlstra Jan 25, 2017
4f5ad2c
also add ChainMap
JelleZijlstra Jan 25, 2017
a0baeb3
fix for 3.2
JelleZijlstra Jan 25, 2017
622ddfc
fix flake8
JelleZijlstra Jan 25, 2017
dd0eb3d
fix base class of Counter
JelleZijlstra Jan 28, 2017
c0f748a
move counter below Dict
JelleZijlstra Jan 28, 2017
5c5c2e7
clarify error message, add test
JelleZijlstra Jan 28, 2017
3dfbaf9
allow instantiation
JelleZijlstra Jan 31, 2017
cbb42d9
fix reliance on type cache
JelleZijlstra Feb 5, 2017
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
Prev Previous commit
Next Next commit
move counter below Dict
  • Loading branch information
@JelleZijlstra
JelleZijlstra committed Jan 31, 2017
commit c0f748a1dcf5258badd3efabd93d53dc5fa3b1ea
22 changes: 11 additions & 11 deletions python2/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1719,17 +1719,6 @@ def __new__(cls, *args, **kwds):
return _generic_new(collections.deque, cls, *args, **kwds)


class Counter(collections.Counter, Dict[T, int]):
__slots__ = ()
__extra__ = collections.Counter

def __new__(cls, *args, **kwds):
if _geqv(cls, Counter):
raise TypeError("Type Counter cannot be instantiated; "
"use Counter() instead")
return _generic_new(collections.Counter, cls, *args, **kwds)


class Set(set, MutableSet[T]):
__slots__ = ()
__extra__ = set
Expand Down Expand Up @@ -1795,6 +1784,17 @@ def __new__(cls, *args, **kwds):
return _generic_new(collections.defaultdict, cls, *args, **kwds)


class Counter(collections.Counter, Dict[T, int]):
__slots__ = ()
__extra__ = collections.Counter

def __new__(cls, *args, **kwds):
if _geqv(cls, Counter):
raise TypeError("Type Counter cannot be instantiated; "
"use Counter() instead")
Copy link
Member

@ilevkivskyi ilevkivskyi Jan 28, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would use full name collections.Counter() in the second line, otherwise this error message reads unclear.
(The same applies to Python 3 version).

return _generic_new(collections.Counter, cls, *args, **kwds)


# Determine what base class to use for Generator.
if hasattr(collections_abc, 'Generator'):
# Sufficiently recent versions of 3.5 have a Generator ABC.
Expand Down
22 changes: 11 additions & 11 deletions src/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1830,17 +1830,6 @@ def __new__(cls, *args, **kwds):
return _generic_new(collections.deque, cls, *args, **kwds)


class Counter(collections.Counter, Dict[T, int], extra=collections.Counter):

__slots__ = ()

def __new__(cls, *args, **kwds):
if _geqv(cls, Counter):
raise TypeError("Type Counter cannot be instantiated; "
"use Counter() instead")
return _generic_new(collections.Counter, cls, *args, **kwds)


class Set(set, MutableSet[T], extra=set):

__slots__ = ()
Expand Down Expand Up @@ -1910,6 +1899,17 @@ def __new__(cls, *args, **kwds):
return _generic_new(collections.defaultdict, cls, *args, **kwds)


class Counter(collections.Counter, Dict[T, int], extra=collections.Counter):

__slots__ = ()

def __new__(cls, *args, **kwds):
if _geqv(cls, Counter):
raise TypeError("Type Counter cannot be instantiated; "
"use Counter() instead")
return _generic_new(collections.Counter, cls, *args, **kwds)


if hasattr(collections, 'ChainMap'):
# ChainMap only exists in 3.3+
__all__.append('ChainMap')
Expand Down