summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/functions.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-05-30 16:20:59 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-05-30 16:20:59 -0400
commitbef93660c1b4a613d8545d6d04f9cac45254cd89 (patch)
treed2c82b55c6739c1c30c83c93453be2d9b0e7ac9b /lib/sqlalchemy/sql/functions.py
parent6e64098eff7e9c15c98aa0d29fa5ec9ae8267e85 (diff)
downloadsqlalchemy-bef93660c1b4a613d8545d6d04f9cac45254cd89.tar.gz
- implement armin's awesome metaclass adaptor, can drop the refs to MetaBase.
Diffstat (limited to 'lib/sqlalchemy/sql/functions.py')
-rw-r--r--lib/sqlalchemy/sql/functions.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/sqlalchemy/sql/functions.py b/lib/sqlalchemy/sql/functions.py
index 244505bed..5e2d0792c 100644
--- a/lib/sqlalchemy/sql/functions.py
+++ b/lib/sqlalchemy/sql/functions.py
@@ -31,14 +31,13 @@ def register_function(identifier, fn, package="_default"):
class _GenericMeta(VisitableType):
def __init__(cls, clsname, bases, clsdict):
- if clsname != 'MetaBase':
- cls.name = name = clsdict.get('name', clsname)
- cls.identifier = identifier = clsdict.get('identifier', name)
- package = clsdict.pop('package', '_default')
- # legacy
- if '__return_type__' in clsdict:
- cls.type = clsdict['__return_type__']
- register_function(identifier, cls, package)
+ cls.name = name = clsdict.get('name', clsname)
+ cls.identifier = identifier = clsdict.get('identifier', name)
+ package = clsdict.pop('package', '_default')
+ # legacy
+ if '__return_type__' in clsdict:
+ cls.type = clsdict['__return_type__']
+ register_function(identifier, cls, package)
super(_GenericMeta, cls).__init__(clsname, bases, clsdict)