diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/orm/__init__.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/util.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py index 222bd75fb..12cc1316e 100644 --- a/lib/sqlalchemy/orm/__init__.py +++ b/lib/sqlalchemy/orm/__init__.py @@ -546,7 +546,7 @@ def clear_mappers(): for mapper in mapper_registry.values(): mapper.dispose() mapper_registry.clear() - mapperlib.ClassKey.dispose() + mapperlib.ClassKey.dispose(mapperlib.ClassKey) finally: mapperlib._COMPILE_MUTEX.release() diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py index 6fd3a81ef..ad3b30e8d 100644 --- a/lib/sqlalchemy/util.py +++ b/lib/sqlalchemy/util.py @@ -123,10 +123,10 @@ class ArgSingleton(type): instances = {} def dispose(cls): - for key in ArgSingleton.instances: + for key in list(ArgSingleton.instances): if key[0] is cls: del ArgSingleton.instances[key] - dispose = classmethod(dispose) + dispose = staticmethod(dispose) def __call__(self, *args): hashkey = (self, args) |