x/wsme
Code Issues Proposed changes

Merge "Allow non-auto-registered complex type"

Browse Source
This commit is contained in:
Jenkins 2014-11-11 09:00:05 +00:00 committed by Gerrit Code Review
commit 3c3581b8bb
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wsme/tests/test_types.py
View File

@ -629,3 +629,11 @@ Value: 'v3'. Value should be one of: v., v.",
TempType.add_attributes(two=int)
after = types.list_attributes(TempType)
self.assertEqual(len(after), 2)
def test_non_registered_complex_type(self):
class TempType(types.Base):
__registry__ = None
self.assertFalse(types.iscomplex(TempType))
types.registry.register(TempType)
self.assertTrue(types.iscomplex(TempType))

2
wsme/types.py
View File

@ -754,7 +754,7 @@ class BaseMeta(type):
return type.__new__(cls, name, bases, dct)
def __init__(cls, name, bases, dct):
if bases and bases[0] is not object:
if bases and bases[0] is not object and cls.__registry__:
cls.__registry__.register(cls)