]> granicus.if.org Git - python/commitdiff
Added another test case for kwonly methods
authorChristian Heimes <christian@cheimes.de>
Sat, 8 Dec 2007 22:32:47 +0000 (22:32 +0000)
committerChristian Heimes <christian@cheimes.de>
Sat, 8 Dec 2007 22:32:47 +0000 (22:32 +0000)
Lib/test/test_keywordonlyarg.py
Lib/test/test_xmlrpc.py

index 124257ecc73a5cf8984fff015b777f711b25675a..eeda5473fa6965930788ca6f187383c91a5e03c3 100644 (file)
@@ -151,6 +151,15 @@ class KeywordOnlyArgTestCase(unittest.TestCase):
         self.assertEqual(f(), {})
         self.assertEqual(f(k1=1, k2=2), {'k1' : 1, 'k2' : 2})
 
+    def test_kwonly_methods(self):
+        class Example:
+            def f(self, *, k1=1, k2=2):
+                return k1, k2
+
+        self.assertEqual(Example().f(k1=1, k2=2), (1, 2))
+        self.assertEqual(Example.f(Example(), k1=1, k2=2), (1, 2))
+        self.assertRaises(TypeError, Example.f, k1=1, k2=2)
+
 def test_main():
     run_unittest(KeywordOnlyArgTestCase)
 
index 6f78d95a3ccede04cbfd1169e519bcada7d2d0df..ade6f8445c4c9e6c4276183873a654916f596a61 100644 (file)
@@ -169,6 +169,13 @@ class FaultTestCase(unittest.TestCase):
         s = xmlrpclib.Marshaller().dumps(f)
         self.assertRaises(xmlrpclib.Fault, xmlrpclib.loads, s)
 
+    def test_dotted_attribute(self):
+        # this will raise AttirebuteError because code don't want us to use
+        # private methods
+        self.assertRaises(AttributeError,
+                          SimpleXMLRPCServer.resolve_dotted_attribute, str, '__add')
+
+        self.assert_(SimpleXMLRPCServer.resolve_dotted_attribute(str, 'title'))
 
 class DateTimeTestCase(unittest.TestCase):
     def test_default(self):
@@ -432,14 +439,6 @@ class SimpleServerTestCase(unittest.TestCase):
                 # protocol error; provide additional information in test output
                 self.fail("%s\n%s" % (e, e.headers))
 
-    def test_dotted_attribute(self):
-        # this will raise AttirebuteError because code don't want us to use
-        # private methods
-        self.assertRaises(AttributeError,
-                          SimpleXMLRPCServer.resolve_dotted_attribute, str, '__add')
-
-        self.assert_(SimpleXMLRPCServer.resolve_dotted_attribute(str, 'title'))
-
 # This is a contrived way to make a failure occur on the server side
 # in order to test the _send_traceback_header flag on the server
 class FailingMessageClass(mimetools.Message):