Changeset 1529

Timestamp:

07/14/08 14:19:26 (5 months ago)

Author:

nick

Message:

Merged source:pyamf/branches/class-init-args-322

Fixes: #322
Author: mvtellingen
Reviewer: nick

Location:

pyamf/trunk

Files:

• . (modified) (1 prop)
• pyamf/__init__.py (modified) (2 diffs)
• pyamf/tests/test_basic.py (modified) (1 diff)

pyamf/trunk

@@ -1 @@
-/pyamf/branches/remote-object-async-message-292:1512-1521
+/pyamf/branches/class-init-args-322:1527-1528
+/pyamf/trunk:1525-1526

@@ -1 @@
-/pyamf/branches/remote-object-async-message-292:1512-1521
+/pyamf/branches/class-init-args-322:1527-1528
+/pyamf/trunk:1525-1526

pyamf/trunk/pyamf/__init__.py

@@ -362 +362 @@
             elif type(self.klass) is types.ClassType: # classic class
                 return util.make_classic_instance(self.klass)
-
             raise TypeError, 'invalid class type %r' % self.klass
-
+        
         return self.klass(*args, **kwargs)
 
@@ -635 +634 @@
         raise ValueError, "alias '%s' already registered" % alias
 
+    # Check that the constructor of the class doesn't require any additonal
+    # arguments.
+    if hasattr(klass, '__init__') and hasattr(klass.__init__, 'im_func'):
+        klass_func = klass.__init__.im_func
+        # Number of arguments - number of default values
+        if klass_func.func_code.co_argcount - len(klass_func.func_defaults or []) > 1:
+            raise TypeError("pyamf doesn't support required init arguments")
+
     x = ClassAlias(klass, alias, attr_func=attr_func, attrs=attrs,
         metadata=metadata)

pyamf/trunk/pyamf/tests/test_basic.py

@@ -427 +427 @@
 
         self.assertEquals(pyamf.has_alias(Spam), True)
+
+    def test_required_arguments(self):
+        class Foo(object):
+            def __init__(self, bar, valid=1):
+                pass
+        self.assertRaises(TypeError, pyamf.register_class, Foo)
+
+        class Foo(object):
+            def __init__(self, bar, valid):
+                pass
+        self.assertRaises(TypeError, pyamf.register_class, Foo)
+
+        class Foo(object):
+            def __init__(self, bar=1, valid=1):
+                pass
+        pyamf.register_class(Foo)
+
 
 class UnregisterClassTestCase(ClassCacheClearingTestCase):

@@ -1 @@
-/pyamf/branches/remote-object-async-message-292:1512-1521
+/pyamf/branches/class-init-args-322:1527-1528
+/pyamf/trunk:1525-1526