diff options
Diffstat (limited to 'lib/sqlalchemy/orm')
| -rw-r--r-- | lib/sqlalchemy/orm/collections.py | 37 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/evaluator.py | 1 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/identity.py | 14 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/instrumentation.py | 10 |
4 files changed, 11 insertions, 51 deletions
diff --git a/lib/sqlalchemy/orm/collections.py b/lib/sqlalchemy/orm/collections.py index ec4d00cb0..f9afd4ebf 100644 --- a/lib/sqlalchemy/orm/collections.py +++ b/lib/sqlalchemy/orm/collections.py @@ -1250,27 +1250,6 @@ def _list_decorators(): _tidy(__delitem__) return __delitem__ - if util.py2k: - - def __setslice__(fn): - def __setslice__(self, start, end, values): - for value in self[start:end]: - __del(self, value) - values = [__set(self, value) for value in values] - fn(self, start, end, values) - - _tidy(__setslice__) - return __setslice__ - - def __delslice__(fn): - def __delslice__(self, start, end): - for value in self[start:end]: - __del(self, value) - fn(self, start, end) - - _tidy(__delslice__) - return __delslice__ - def extend(fn): def extend(self, iterable): for value in iterable: @@ -1300,16 +1279,14 @@ def _list_decorators(): _tidy(pop) return pop - if not util.py2k: - - def clear(fn): - def clear(self, index=-1): - for item in self: - __del(self, item) - fn(self) + def clear(fn): + def clear(self, index=-1): + for item in self: + __del(self, item) + fn(self) - _tidy(clear) - return clear + _tidy(clear) + return clear # __imul__ : not wrapping this. all members of the collection are already # present, so no need to fire appends... wrapping it with an explicit diff --git a/lib/sqlalchemy/orm/evaluator.py b/lib/sqlalchemy/orm/evaluator.py index 69d80dd8b..fcc7368c4 100644 --- a/lib/sqlalchemy/orm/evaluator.py +++ b/lib/sqlalchemy/orm/evaluator.py @@ -33,7 +33,6 @@ _straight_ops = set( "add", "mul", "sub", - "div", "mod", "truediv", "lt", diff --git a/lib/sqlalchemy/orm/identity.py b/lib/sqlalchemy/orm/identity.py index 6aea0d185..10d924b48 100644 --- a/lib/sqlalchemy/orm/identity.py +++ b/lib/sqlalchemy/orm/identity.py @@ -9,7 +9,6 @@ import weakref from . import util as orm_util from .. import exc as sa_exc -from .. import util class IdentityMap(object): @@ -201,19 +200,8 @@ class WeakInstanceDict(IdentityMap): def __iter__(self): return iter(self.keys()) - if util.py2k: - - def iteritems(self): - return iter(self.items()) - - def itervalues(self): - return iter(self.values()) - def all_states(self): - if util.py2k: - return self._dict.values() - else: - return list(self._dict.values()) + return list(self._dict.values()) def _fast_discard(self, state): # used by InstanceState for state being diff --git a/lib/sqlalchemy/orm/instrumentation.py b/lib/sqlalchemy/orm/instrumentation.py index 02fc73793..626643ce1 100644 --- a/lib/sqlalchemy/orm/instrumentation.py +++ b/lib/sqlalchemy/orm/instrumentation.py @@ -628,12 +628,8 @@ def __init__(%(apply_pos)s): func_vars = util.format_argspec_init(original_init, grouped=False) func_text = func_body % func_vars - if util.py2k: - func = getattr(original_init, "im_func", original_init) - func_defaults = getattr(func, "func_defaults", None) - else: - func_defaults = getattr(original_init, "__defaults__", None) - func_kw_defaults = getattr(original_init, "__kwdefaults__", None) + func_defaults = getattr(original_init, "__defaults__", None) + func_kw_defaults = getattr(original_init, "__kwdefaults__", None) env = locals().copy() env["__name__"] = __name__ @@ -644,7 +640,7 @@ def __init__(%(apply_pos)s): if func_defaults: __init__.__defaults__ = func_defaults - if not util.py2k and func_kw_defaults: + if func_kw_defaults: __init__.__kwdefaults__ = func_kw_defaults return __init__ |