summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/ext
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-05-26 19:06:13 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-05-26 19:06:13 -0400
commit6cde27fe9161a21b075c7b8faa09d1e77169f1f2 (patch)
treed7d986fa78683a7e570dd1e6da84e7bb4ca1b762 /lib/sqlalchemy/ext
parent29689fa566ba1bd3dc08727754632c9e8074137c (diff)
downloadsqlalchemy-6cde27fe9161a21b075c7b8faa09d1e77169f1f2.tar.gz
a pass where we try to squash down as many list()/keys() combinations
as possible
Diffstat (limited to 'lib/sqlalchemy/ext')
-rw-r--r--lib/sqlalchemy/ext/associationproxy.py2
-rw-r--r--lib/sqlalchemy/ext/declarative/api.py2
-rw-r--r--lib/sqlalchemy/ext/declarative/base.py4
-rw-r--r--lib/sqlalchemy/ext/mutable.py4
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/sqlalchemy/ext/associationproxy.py b/lib/sqlalchemy/ext/associationproxy.py
index 39f8a7cf6..08875c3a0 100644
--- a/lib/sqlalchemy/ext/associationproxy.py
+++ b/lib/sqlalchemy/ext/associationproxy.py
@@ -778,7 +778,7 @@ class _AssociationDict(_AssociationCollection):
iteritems = _iteritems
def values(self):
- return [self._get(member) for member in list(self.col.values())]
+ return [self._get(member) for member in self.col.values()]
def items(self):
return [(k, self._get(self.col[k])) for k in self]
diff --git a/lib/sqlalchemy/ext/declarative/api.py b/lib/sqlalchemy/ext/declarative/api.py
index bc0c5a38c..2f222f682 100644
--- a/lib/sqlalchemy/ext/declarative/api.py
+++ b/lib/sqlalchemy/ext/declarative/api.py
@@ -424,7 +424,7 @@ class DeferredReflection(object):
def prepare(cls, engine):
"""Reflect all :class:`.Table` objects for all current
:class:`.DeferredReflection` subclasses"""
- to_map = [m for m in list(_MapperConfig.configs.values())
+ to_map = [m for m in _MapperConfig.configs.values()
if issubclass(m.cls, cls)]
for thingy in to_map:
cls._sa_decl_prepare(thingy.local_table, engine)
diff --git a/lib/sqlalchemy/ext/declarative/base.py b/lib/sqlalchemy/ext/declarative/base.py
index 2099f9eb0..9187ed7f8 100644
--- a/lib/sqlalchemy/ext/declarative/base.py
+++ b/lib/sqlalchemy/ext/declarative/base.py
@@ -57,7 +57,7 @@ def _as_declarative(cls, classname, dict_):
class_mapped = _declared_mapping_info(base) is not None
- for name, obj in list(vars(base).items()):
+ for name, obj in vars(base).items():
if name == '__mapper_args__':
if not mapper_args_fn and (
not class_mapped or
@@ -129,7 +129,7 @@ def _as_declarative(cls, classname, dict_):
ret.doc = obj.__doc__
# apply inherited columns as we should
- for k, v in list(potential_columns.items()):
+ for k, v in potential_columns.items():
dict_[k] = v
if inherited_table_args and not tablename:
diff --git a/lib/sqlalchemy/ext/mutable.py b/lib/sqlalchemy/ext/mutable.py
index 08c0bdf13..b1b851f72 100644
--- a/lib/sqlalchemy/ext/mutable.py
+++ b/lib/sqlalchemy/ext/mutable.py
@@ -485,7 +485,7 @@ class Mutable(MutableBase):
def changed(self):
"""Subclasses should call this method whenever change events occur."""
- for parent, key in list(self._parents.items()):
+ for parent, key in self._parents.items():
flag_modified(parent, key)
@classmethod
@@ -579,7 +579,7 @@ class MutableComposite(MutableBase):
def changed(self):
"""Subclasses should call this method whenever change events occur."""
- for parent, key in list(self._parents.items()):
+ for parent, key in self._parents.items():
prop = object_mapper(parent).get_property(key)
for value, attr_name in zip(