diff options
Diffstat (limited to 'lib/sqlalchemy/util/_collections.py')
| -rw-r--r-- | lib/sqlalchemy/util/_collections.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py index 67be0e6bf..13575d12d 100644 --- a/lib/sqlalchemy/util/_collections.py +++ b/lib/sqlalchemy/util/_collections.py @@ -8,17 +8,17 @@ """Collection classes and helpers.""" from __future__ import absolute_import -import weakref + import operator -from .compat import ( - threading, - itertools_filterfalse, - string_types, - binary_types, - collections_abc, -) -from . import py2k import types +import weakref + +from .compat import binary_types +from .compat import collections_abc +from .compat import itertools_filterfalse +from .compat import py2k +from .compat import string_types +from .compat import threading EMPTY_SET = frozenset() @@ -196,8 +196,8 @@ class Properties(object): def __add__(self, other): return list(self) + list(other) - def __setitem__(self, key, object): - self._data[key] = object + def __setitem__(self, key, obj): + self._data[key] = obj def __getitem__(self, key): return self._data[key] @@ -339,7 +339,7 @@ class OrderedDict(dict): def iteritems(self): return iter(self.items()) - def __setitem__(self, key, object): + def __setitem__(self, key, obj): if key not in self: try: self._list.append(key) @@ -347,7 +347,7 @@ class OrderedDict(dict): # work around Python pickle loads() with # dict subclass (seems to ignore __setstate__?) self._list = [key] - dict.__setitem__(self, key, object) + dict.__setitem__(self, key, obj) def __delitem__(self, key): dict.__delitem__(self, key) @@ -822,7 +822,7 @@ def to_list(x, default=None): def has_intersection(set_, iterable): - """return True if any items of set_ are present in iterable. + r"""return True if any items of set\_ are present in iterable. Goes through special effort to ensure __hash__ is not called on items in iterable that don't support it. |