From 4b614b9b35cd2baddb7ca67c04bee5d70ec6a172 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sat, 27 Apr 2013 19:53:57 -0400 Subject: - the raw 2to3 run - went through examples/ and cleaned out excess list() calls --- lib/sqlalchemy/event.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'lib/sqlalchemy/event.py') diff --git a/lib/sqlalchemy/event.py b/lib/sqlalchemy/event.py index f28f19ee9..de054b0fd 100644 --- a/lib/sqlalchemy/event.py +++ b/lib/sqlalchemy/event.py @@ -201,11 +201,9 @@ def _remove_dispatcher(cls): del _registrars[k] -class Events(object): +class Events(object, metaclass=_EventMeta): """Define event listening functions for a particular target type.""" - __metaclass__ = _EventMeta - @classmethod def _accept_with(cls, target): # Mapper, ClassManager, Session override this to @@ -302,7 +300,7 @@ class _DispatchDescriptor(object): def clear(self): """Clear all class level listeners""" - for dispatcher in self._clslevel.values(): + for dispatcher in list(self._clslevel.values()): dispatcher[:] = [] def for_modify(self, obj): @@ -377,7 +375,7 @@ class _EmptyListener(object): def __iter__(self): return iter(self.parent_listeners) - def __nonzero__(self): + def __bool__(self): return bool(self.parent_listeners) @@ -414,7 +412,7 @@ class _CompoundListener(object): def __iter__(self): return chain(self.parent_listeners, self.listeners) - def __nonzero__(self): + def __bool__(self): return bool(self.listeners or self.parent_listeners) -- cgit v1.2.1 From c926f0a9d8910c67554f053ed0f7902542679f0d Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sat, 27 Apr 2013 20:38:53 -0400 Subject: plugging away --- lib/sqlalchemy/event.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/sqlalchemy/event.py') diff --git a/lib/sqlalchemy/event.py b/lib/sqlalchemy/event.py index de054b0fd..316161fdf 100644 --- a/lib/sqlalchemy/event.py +++ b/lib/sqlalchemy/event.py @@ -200,10 +200,11 @@ def _remove_dispatcher(cls): if not _registrars[k]: del _registrars[k] - -class Events(object, metaclass=_EventMeta): +class Events(object): #util.with_metaclass(_EventMeta, object)): """Define event listening functions for a particular target type.""" + __metaclass__ = _EventMeta + @classmethod def _accept_with(cls, target): # Mapper, ClassManager, Session override this to -- cgit v1.2.1 From 32e0a1624bf1ae3cb6309062adefd2f5c89b541c Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sat, 27 Apr 2013 20:58:13 -0400 Subject: import of "sqlalchemy" and "sqlalchemy.orm" works. --- lib/sqlalchemy/event.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/sqlalchemy/event.py') diff --git a/lib/sqlalchemy/event.py b/lib/sqlalchemy/event.py index 316161fdf..79d024f9b 100644 --- a/lib/sqlalchemy/event.py +++ b/lib/sqlalchemy/event.py @@ -171,7 +171,8 @@ class _EventMeta(type): associated _Dispatch classes.""" def __init__(cls, classname, bases, dict_): - _create_dispatcher_class(cls, classname, bases, dict_) + if classname != 'MetaBase': + _create_dispatcher_class(cls, classname, bases, dict_) return type.__init__(cls, classname, bases, dict_) @@ -200,11 +201,9 @@ def _remove_dispatcher(cls): if not _registrars[k]: del _registrars[k] -class Events(object): #util.with_metaclass(_EventMeta, object)): +class Events(util.with_metaclass(_EventMeta, object)): """Define event listening functions for a particular target type.""" - __metaclass__ = _EventMeta - @classmethod def _accept_with(cls, target): # Mapper, ClassManager, Session override this to -- cgit v1.2.1 From 220fa91337aced11789b23065289203414f2063d Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sat, 4 May 2013 16:23:27 -0400 Subject: most of ORM passing... --- lib/sqlalchemy/event.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/sqlalchemy/event.py') diff --git a/lib/sqlalchemy/event.py b/lib/sqlalchemy/event.py index 79d024f9b..33626cf2a 100644 --- a/lib/sqlalchemy/event.py +++ b/lib/sqlalchemy/event.py @@ -378,6 +378,8 @@ class _EmptyListener(object): def __bool__(self): return bool(self.parent_listeners) + __nonzero__ = __bool__ + class _CompoundListener(object): _exec_once = False @@ -415,6 +417,7 @@ class _CompoundListener(object): def __bool__(self): return bool(self.listeners or self.parent_listeners) + __nonzero__ = __bool__ class _ListenerCollection(_CompoundListener): """Instance-level attributes on instances of :class:`._Dispatch`. -- cgit v1.2.1 From 6cde27fe9161a21b075c7b8faa09d1e77169f1f2 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 26 May 2013 19:06:13 -0400 Subject: a pass where we try to squash down as many list()/keys() combinations as possible --- lib/sqlalchemy/event.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/sqlalchemy/event.py') diff --git a/lib/sqlalchemy/event.py b/lib/sqlalchemy/event.py index 33626cf2a..d8c44dd05 100644 --- a/lib/sqlalchemy/event.py +++ b/lib/sqlalchemy/event.py @@ -300,7 +300,7 @@ class _DispatchDescriptor(object): def clear(self): """Clear all class level listeners""" - for dispatcher in list(self._clslevel.values()): + for dispatcher in self._clslevel.values(): dispatcher[:] = [] def for_modify(self, obj): -- cgit v1.2.1