summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2007-12-08 22:32:47 (GMT)
committerChristian Heimes <christian@cheimes.de>2007-12-08 22:32:47 (GMT)
commiteda9e2b66a793f9ca9dfca6eae5c1c239f4f51cb (patch)
tree1e11f0f3330b4fdc111aaa8606dfa1d19b0d9cc6
parent0da5bd6ee1b6a0e6f9397f43dab68ba098b04b58 (diff)
downloadcpython-eda9e2b66a793f9ca9dfca6eae5c1c239f4f51cb.zip
cpython-eda9e2b66a793f9ca9dfca6eae5c1c239f4f51cb.tar.gz
cpython-eda9e2b66a793f9ca9dfca6eae5c1c239f4f51cb.tar.bz2
Added another test case for kwonly methods
-rw-r--r--Lib/test/test_keywordonlyarg.py9
-rw-r--r--Lib/test/test_xmlrpc.py15
2 files changed, 16 insertions, 8 deletions
diff --git a/Lib/test/test_keywordonlyarg.py b/Lib/test/test_keywordonlyarg.py
index 124257e..eeda547 100644
--- a/Lib/test/test_keywordonlyarg.py
+++ b/Lib/test/test_keywordonlyarg.py
@@ -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)
diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py
index 6f78d95..ade6f84 100644
--- a/Lib/test/test_xmlrpc.py
+++ b/Lib/test/test_xmlrpc.py
@@ -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):