diff options
author | Diana Clarke <diana.joan.clarke@gmail.com> | 2012-11-19 13:31:21 -0500 |
---|---|---|
committer | Diana Clarke <diana.joan.clarke@gmail.com> | 2012-11-19 13:31:21 -0500 |
commit | ef326d9fe39ab493dd4aeaf2cecf9052a04d49b7 (patch) | |
tree | 0684ba72e53a9321a36f07a3a8a5dcec833b55e5 /lib/sqlalchemy/ext/declarative/clsregistry.py | |
parent | 34b8b22659999eae459ca33baa3ca479f8eb5bf1 (diff) | |
download | sqlalchemy-ef326d9fe39ab493dd4aeaf2cecf9052a04d49b7.tar.gz |
just a pep8 pass of lib/sqlalchemy/ext/declarative
Diffstat (limited to 'lib/sqlalchemy/ext/declarative/clsregistry.py')
-rw-r--r-- | lib/sqlalchemy/ext/declarative/clsregistry.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/sqlalchemy/ext/declarative/clsregistry.py b/lib/sqlalchemy/ext/declarative/clsregistry.py index 47450c5b7..a0e177f77 100644 --- a/lib/sqlalchemy/ext/declarative/clsregistry.py +++ b/lib/sqlalchemy/ext/declarative/clsregistry.py @@ -22,6 +22,7 @@ import weakref # themselves when all references to contained classes are removed. _registries = set() + def add_class(classname, cls): """Add a class to the _decl_class_registry associated with the given declarative class. @@ -111,6 +112,7 @@ class _MultipleClassMarker(object): ) self.contents.add(weakref.ref(item, self._remove_item)) + class _ModuleMarker(object): """"refers to a module name within _decl_class_registry. @@ -160,7 +162,6 @@ class _ModuleMarker(object): on_remove=lambda: self._remove_item(name)) - class _ModNS(object): def __init__(self, parent): self.__parent = parent @@ -180,6 +181,7 @@ class _ModNS(object): raise AttributeError("Module %r has no mapped classes " "registered under the name %r" % (self.__parent.name, key)) + class _GetColumns(object): def __init__(self, cls): self.cls = cls @@ -200,6 +202,7 @@ class _GetColumns(object): " directly to a Column)." % key) return getattr(self.cls, key) + class _GetTable(object): def __init__(self, key, metadata): self.key = key @@ -210,11 +213,13 @@ class _GetTable(object): _get_table_key(key, self.key) ] + def _determine_container(key, value): if isinstance(value, _MultipleClassMarker): value = value.attempt_get([], key) return _GetColumns(value) + def _resolver(cls, prop): def resolve_arg(arg): import sqlalchemy @@ -232,11 +237,13 @@ def _resolver(cls, prop): return _GetTable(key, cls.metadata) elif '_sa_module_registry' in cls._decl_class_registry and \ key in cls._decl_class_registry['_sa_module_registry']: - return cls._decl_class_registry['_sa_module_registry'].resolve_attr(key) + registry = cls._decl_class_registry['_sa_module_registry'] + return registry.resolve_attr(key) else: return fallback[key] d = util.PopulateDict(access_cls) + def return_cls(): try: x = eval(arg, globals(), d) @@ -256,6 +263,7 @@ def _resolver(cls, prop): return return_cls return resolve_arg + def _deferred_relationship(cls, prop): if isinstance(prop, RelationshipProperty): |