changeset:   89999:070dfca74610
branch:      3.4
parent:      89997:07984815003f
user:        Yury Selivanov <yselivanov@sprymix.com>
date:        Thu Mar 27 18:23:03 2014 -0400
files:       Lib/inspect.py Lib/test/test_inspect.py Misc/NEWS
description:
inspect: Fix getcallargs() to raise correct TypeError

... for missing keyword-only arguments. Patch by Jeremiah Lowin.
Closes #20816.


diff -r 07984815003f -r 070dfca74610 Lib/inspect.py
--- a/Lib/inspect.py	Thu Mar 27 12:21:20 2014 -0400
+++ b/Lib/inspect.py	Thu Mar 27 18:23:03 2014 -0400
@@ -1208,7 +1208,7 @@
     missing = 0
     for kwarg in kwonlyargs:
         if kwarg not in arg2value:
-            if kwarg in kwonlydefaults:
+            if kwonlydefaults and kwarg in kwonlydefaults:
                 arg2value[kwarg] = kwonlydefaults[kwarg]
             else:
                 missing += 1
diff -r 07984815003f -r 070dfca74610 Lib/test/test_inspect.py
--- a/Lib/test/test_inspect.py	Thu Mar 27 12:21:20 2014 -0400
+++ b/Lib/test/test_inspect.py	Thu Mar 27 18:23:03 2014 -0400
@@ -1206,6 +1206,14 @@
         self.assertEqualException(f3, '1, 2')
         self.assertEqualException(f3, '1, 2, a=1, b=2')
 
+        # issue #20816: getcallargs() fails to iterate over non-existent
+        # kwonlydefaults and raises a wrong TypeError
+        def f5(*, a): pass
+        with self.assertRaisesRegex(TypeError,
+                                    'missing 1 required keyword-only'):
+            inspect.getcallargs(f5)
+
+
 class TestGetcallargsMethods(TestGetcallargsFunctions):
 
     def setUp(self):
diff -r 07984815003f -r 070dfca74610 Misc/NEWS
--- a/Misc/NEWS	Thu Mar 27 12:21:20 2014 -0400
+++ b/Misc/NEWS	Thu Mar 27 18:23:03 2014 -0400
@@ -83,6 +83,9 @@
 - Issue #19748: On AIX, time.mktime() now raises an OverflowError for year
   outsize range [1902; 2037].
 
+- Issue #20816: Fix inspect.getcallargs() to raise correct TypeError for
+  missing keyword-only arguments. Patch by Jeremiah Lowin.
+
 Documentation
 -------------