[Python-checkins] cpython (merge 3.5 -> default): Merge typing.py 3.5->3.6 (Text, ItemsView).
guido.van.rossum
python-checkins at python.org
Tue Apr 5 17:57:14 EDT 2016
https://hg.python.org/cpython/rev/a94c2ddfd855
changeset: 100856:a94c2ddfd855
parent: 100854:78b84ae0b745
parent: 100855:2577a3684f90
user: Guido van Rossum <guido at dropbox.com>
date: Tue Apr 05 14:57:03 2016 -0700
summary:
Merge typing.py 3.5->3.6 (Text, ItemsView).
files:
Lib/typing.py | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Lib/typing.py b/Lib/typing.py
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -65,6 +65,7 @@
'no_type_check',
'no_type_check_decorator',
'overload',
+ 'Text',
]
# The pseudo-submodules 're' and 'io' are part of the public
@@ -1519,7 +1520,7 @@
class ItemsView(MappingView[Tuple[KT, VT_co]],
- Set[Tuple[KT, VT_co]],
+ AbstractSet[Tuple[KT, VT_co]],
Generic[KT, VT_co],
extra=collections_abc.ItemsView):
pass
@@ -1592,6 +1593,10 @@
return cls
+# Python-version-specific alias (Python 2: unicode; Python 3: str)
+Text = str
+
+
class IO(Generic[AnyStr]):
"""Generic base class for TextIO and BinaryIO.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list