Merge pull request #19 from seth-p/mapper_table_args

Deleted merge_{mapper,table}_args().
dgilland · Mar 24, 2015 · e7ca049 · e7ca049
2 parents b3175a0 + 86729a7
commit e7ca049
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 29 deletions.
diff --git a/alchy/model.py b/alchy/model.py
@@ -14,8 +14,7 @@
     has_primary_key,
     camelcase_to_underscore,
     get_mapper_class,
-    merge_mapper_args,
-    merge_table_args,
+    merge_declarative_args,
 )
 from ._compat import iteritems
 
@@ -127,11 +126,19 @@ class User(Model):
 
     @declared_attr
     def __mapper_args__(cls):  # pylint: disable=no-self-argument
-        return merge_mapper_args(cls)
+        _, kargs = merge_declarative_args(cls,
+                                          '__global_mapper_args__',
+                                          '__local_mapper_args__')
+        return kargs
 
     @declared_attr
     def __table_args__(cls):  # pylint: disable=no-self-argument
-        return merge_table_args(cls)
+        args, kargs = merge_declarative_args(cls,
+                                             '__global_table_args__',
+                                             '__local_table_args__')
+        # Append kargs onto end of args to adhere to SQLAlchemy requirements.
+        args.append(kargs)
+        return tuple(args)
 
     def __init__(self, *args, **kargs):
         """Initialize model instance by calling :meth:`update`."""

diff --git a/alchy/utils.py b/alchy/utils.py
@@ -127,28 +127,3 @@ def merge_declarative_args(cls, global_config_key, local_config_key):
     args = unique(args)
 
     return (args, kargs)
-
-
-def merge_mapper_args(cls):
-    """Merge `__mapper_args__` from all base dictionaries and
-    `__local_mapper_args__` from first base into single inherited object.
-    """
-    _, kargs = merge_declarative_args(cls,
-                                      '__global_mapper_args__',
-                                      '__local_mapper_args__')
-
-    return kargs
-
-
-def merge_table_args(cls):
-    """Merge `__table_args__` from all base dictionaries and
-    `__local_table_args__` from first base into single inherited object.
-    """
-    args, kargs = merge_declarative_args(cls,
-                                         '__global_table_args__',
-                                         '__local_table_args__')
-
-    # Append kargs onto end of args to adhere to SQLAlchemy requirements.
-    args.append(kargs)
-
-    return tuple(args)