Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
68b56d02
Commit
68b56d02
authored
Dec 02, 2018
by
Ismo Toijala
Committed by
Ivan Levkivskyi
Dec 02, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-35341: Add generic version of OrderedDict to typing (GH-10850)
parent
32bc11c3
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
0 deletions
+24
-0
Doc/library/typing.rst
Doc/library/typing.rst
+6
-0
Lib/test/test_typing.py
Lib/test/test_typing.py
+16
-0
Lib/typing.py
Lib/typing.py
+1
-0
Misc/NEWS.d/next/Library/2018-12-02-13-50-52.bpo-35341.32E8T_.rst
...S.d/next/Library/2018-12-02-13-50-52.bpo-35341.32E8T_.rst
+1
-0
No files found.
Doc/library/typing.rst
View file @
68b56d02
...
@@ -689,6 +689,12 @@ The module defines the following classes, functions and decorators:
...
@@ -689,6 +689,12 @@ The module defines the following classes, functions and decorators:
.. versionadded:: 3.5.2
.. versionadded:: 3.5.2
.. class:: OrderedDict(collections.OrderedDict, MutableMapping[KT, VT])
A generic version of :class:`collections.OrderedDict`.
.. versionadded:: 3.7.2
.. class:: Counter(collections.Counter, Dict[T, int])
.. class:: Counter(collections.Counter, Dict[T, int])
A generic version of :class:`collections.Counter`.
A generic version of :class:`collections.Counter`.
...
...
Lib/test/test_typing.py
View file @
68b56d02
...
@@ -2075,6 +2075,22 @@ class CollectionsAbcTests(BaseTestCase):
...
@@ -2075,6 +2075,22 @@ class CollectionsAbcTests(BaseTestCase):
self
.
assertIsSubclass
(
MyDefDict
,
collections
.
defaultdict
)
self
.
assertIsSubclass
(
MyDefDict
,
collections
.
defaultdict
)
self
.
assertNotIsSubclass
(
collections
.
defaultdict
,
MyDefDict
)
self
.
assertNotIsSubclass
(
collections
.
defaultdict
,
MyDefDict
)
def
test_ordereddict_instantiation
(
self
):
self
.
assertIs
(
type
(
typing
.
OrderedDict
()),
collections
.
OrderedDict
)
self
.
assertIs
(
type
(
typing
.
OrderedDict
[
KT
,
VT
]()),
collections
.
OrderedDict
)
self
.
assertIs
(
type
(
typing
.
OrderedDict
[
str
,
int
]()),
collections
.
OrderedDict
)
def
test_ordereddict_subclass
(
self
):
class
MyOrdDict
(
typing
.
OrderedDict
[
str
,
int
]):
pass
od
=
MyOrdDict
()
self
.
assertIsInstance
(
od
,
MyOrdDict
)
self
.
assertIsSubclass
(
MyOrdDict
,
collections
.
OrderedDict
)
self
.
assertNotIsSubclass
(
collections
.
OrderedDict
,
MyOrdDict
)
@
skipUnless
(
sys
.
version_info
>=
(
3
,
3
),
'ChainMap was added in 3.3'
)
@
skipUnless
(
sys
.
version_info
>=
(
3
,
3
),
'ChainMap was added in 3.3'
)
def
test_chainmap_instantiation
(
self
):
def
test_chainmap_instantiation
(
self
):
self
.
assertIs
(
type
(
typing
.
ChainMap
()),
collections
.
ChainMap
)
self
.
assertIs
(
type
(
typing
.
ChainMap
()),
collections
.
ChainMap
)
...
...
Lib/typing.py
View file @
68b56d02
...
@@ -1241,6 +1241,7 @@ ContextManager = _alias(contextlib.AbstractContextManager, T_co)
...
@@ -1241,6 +1241,7 @@ ContextManager = _alias(contextlib.AbstractContextManager, T_co)
AsyncContextManager
=
_alias
(
contextlib
.
AbstractAsyncContextManager
,
T_co
)
AsyncContextManager
=
_alias
(
contextlib
.
AbstractAsyncContextManager
,
T_co
)
Dict
=
_alias
(
dict
,
(
KT
,
VT
),
inst
=
False
)
Dict
=
_alias
(
dict
,
(
KT
,
VT
),
inst
=
False
)
DefaultDict
=
_alias
(
collections
.
defaultdict
,
(
KT
,
VT
))
DefaultDict
=
_alias
(
collections
.
defaultdict
,
(
KT
,
VT
))
OrderedDict
=
_alias
(
collections
.
OrderedDict
,
(
KT
,
VT
))
Counter
=
_alias
(
collections
.
Counter
,
T
)
Counter
=
_alias
(
collections
.
Counter
,
T
)
ChainMap
=
_alias
(
collections
.
ChainMap
,
(
KT
,
VT
))
ChainMap
=
_alias
(
collections
.
ChainMap
,
(
KT
,
VT
))
Generator
=
_alias
(
collections
.
abc
.
Generator
,
(
T_co
,
T_contra
,
V_co
))
Generator
=
_alias
(
collections
.
abc
.
Generator
,
(
T_co
,
T_contra
,
V_co
))
...
...
Misc/NEWS.d/next/Library/2018-12-02-13-50-52.bpo-35341.32E8T_.rst
0 → 100644
View file @
68b56d02
Add generic version of ``collections.OrderedDict`` to the ``typing`` module. Patch by Ismo Toijala.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment