better assert

dimagi · Sep 9, 2014 · 77e0af3 · 77e0af3
1 parent b7c0d60
commit 77e0af3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/jsonobject/base.py b/jsonobject/base.py
@@ -715,7 +715,8 @@ def __new__(mcs, name, bases, dct):
     def __configure(cls, properties=None, string_conversions=None,
                     update_properties=None):
         super_settings = get_settings(super(cls, cls))
-        assert len(filter(None, (properties, update_properties))) <= 1
+        assert not properties or not update_properties, \
+            "{} {}".format(properties, update_properties)
         type_config = super_settings.type_config
         if update_properties is not None:
             type_config = type_config.update(properties=update_properties)