summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Grönholm <alex.gronholm@nextday.fi>2020-12-10 21:49:05 (GMT)
committerGitHub <noreply@github.com>2020-12-10 21:49:05 (GMT)
commit67b769f5157c9dad1c7dd6b24e067b9fdab5b35d (patch)
treef7866a693a7fa42ce88f86d89159ce26c1adc361
parenta65828717982e6a56382d7aff738478f5b5b25d0 (diff)
downloadcpython-67b769f5157c9dad1c7dd6b24e067b9fdab5b35d.zip
cpython-67b769f5157c9dad1c7dd6b24e067b9fdab5b35d.tar.gz
cpython-67b769f5157c9dad1c7dd6b24e067b9fdab5b35d.tar.bz2
bpo-42059: Fix required/optional keys for TypedDict(..., total=False) (GH-22736)
-rw-r--r--Lib/test/test_typing.py4
-rw-r--r--Lib/typing.py4
-rw-r--r--Misc/NEWS.d/next/Library/2020-10-17-12-42-08.bpo-42059.ZGMZ3D.rst1
3 files changed, 7 insertions, 2 deletions
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 8ffc7f4..f3e38b6 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -3895,10 +3895,14 @@ class TypedDictTests(BaseTestCase):
self.assertEqual(D(), {})
self.assertEqual(D(x=1), {'x': 1})
self.assertEqual(D.__total__, False)
+ self.assertEqual(D.__required_keys__, frozenset())
+ self.assertEqual(D.__optional_keys__, {'x'})
self.assertEqual(Options(), {})
self.assertEqual(Options(log_level=2), {'log_level': 2})
self.assertEqual(Options.__total__, False)
+ self.assertEqual(Options.__required_keys__, frozenset())
+ self.assertEqual(Options.__optional_keys__, {'log_level', 'log_path'})
def test_optional_keys(self):
class Point2Dor3D(Point2D, total=False):
diff --git a/Lib/typing.py b/Lib/typing.py
index 46c54c4..148a505 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -2043,14 +2043,14 @@ def TypedDict(typename, fields=None, /, *, total=True, **kwargs):
raise TypeError("TypedDict takes either a dict or keyword arguments,"
" but not both")
- ns = {'__annotations__': dict(fields), '__total__': total}
+ ns = {'__annotations__': dict(fields)}
try:
# Setting correct module is necessary to make typed dict classes pickleable.
ns['__module__'] = sys._getframe(1).f_globals.get('__name__', '__main__')
except (AttributeError, ValueError):
pass
- return _TypedDictMeta(typename, (), ns)
+ return _TypedDictMeta(typename, (), ns, total=total)
_TypedDict = type.__new__(_TypedDictMeta, 'TypedDict', (), {})
TypedDict.__mro_entries__ = lambda bases: (_TypedDict,)
diff --git a/Misc/NEWS.d/next/Library/2020-10-17-12-42-08.bpo-42059.ZGMZ3D.rst b/Misc/NEWS.d/next/Library/2020-10-17-12-42-08.bpo-42059.ZGMZ3D.rst
new file mode 100644
index 0000000..3f18824
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-10-17-12-42-08.bpo-42059.ZGMZ3D.rst
@@ -0,0 +1 @@
+:class:`typing.TypedDict` types created using the alternative call-style syntax now correctly respect the ``total`` keyword argument when setting their ``__required_keys__`` and ``__optional_keys__`` class attributes.