Merge pull request #24 from seth-p/merge_declarative_args_declared_at…

…tr_empty Fix merge_declarative_args() for classmethods/callables returning empty list.
dgilland · Apr 26, 2015 · 6403fec · 6403fec
2 parents 47ea146 + 98c5574
commit 6403fec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/alchy/utils.py b/alchy/utils.py
@@ -120,13 +120,12 @@ def merge_declarative_args(cls, global_config_key, local_config_key):
     kargs = {}
 
     for obj in configs:
-        if not obj:
-            continue
-
         obj = get_concrete_value(obj,
                                  cls,
                                  check_classmethod=True,
                                  check_callable=True)
+        if not obj:
+            continue
 
         if isinstance(obj, dict):
             kargs.update(obj)

diff --git a/tests/test_model.py b/tests/test_model.py
@@ -506,7 +506,11 @@ class MixinCM(object):
             def __global_table_args__():
                 return (Index('idx_cm_name', 'name'),)
 
-        class ObjCM(Model, MixinCM, AbstractCM):
+        class MixinEmpty(object):
+            def __global_table_args__():
+                return ()
+
+        class ObjCM(Model, MixinEmpty, MixinCM, AbstractCM):
             text = Column(types.Text())
 
             @classmethod