a pass where we try to squash down as many list()/keys() combinations

as possible

7 files changed, 16 insertions, 16 deletions

diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index 057247047..bfba695b8 100644
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@ -866,7 +866,7 @@ class CollectionAttributeImpl(AttributeImpl):
         self.collection_factory = typecallable
 
     def __copy(self, item):
-        return [y for y in list(collections.collection_adapter(item))]
+        return [y for y in collections.collection_adapter(item)]
 
     def get_history(self, state, dict_, passive=PASSIVE_OFF):
         current = self.get(state, dict_, passive=passive)
diff --git a/lib/sqlalchemy/orm/collections.py b/lib/sqlalchemy/orm/collections.py
index bb7882ee9..03917d112 100644
--- a/lib/sqlalchemy/orm/collections.py
+++ b/lib/sqlalchemy/orm/collections.py
@@ -883,7 +883,7 @@ def _instrument_class(cls):
     # search for _sa_instrument_role-decorated methods in
     # method resolution order, assign to roles
     for supercls in cls.__mro__:
-        for name, method in list(vars(supercls).items()):
+        for name, method in vars(supercls).items():
             if not util.callable(method):
                 continue
 
@@ -917,11 +917,11 @@ def _instrument_class(cls):
     collection_type = util.duck_type_collection(cls)
     if collection_type in __interfaces:
         canned_roles, decorators = __interfaces[collection_type]
-        for role, name in list(canned_roles.items()):
+        for role, name in canned_roles.items():
             roles.setdefault(role, name)
 
         # apply ABC auto-decoration to methods that need it
-        for method, decorator in list(decorators.items()):
+        for method, decorator in decorators.items():
             fn = getattr(cls, method, None)
             if (fn and method not in methods and
                 not hasattr(fn, '_sa_instrumented')):
@@ -952,12 +952,12 @@ def _instrument_class(cls):
 
     # apply ad-hoc instrumentation from decorators, class-level defaults
     # and implicit role declarations
-    for method_name, (before, argument, after) in list(methods.items()):
+    for method_name, (before, argument, after) in methods.items():
         setattr(cls, method_name,
                 _instrument_membership_mutator(getattr(cls, method_name),
                                                before, argument, after))
     # intern the role map
-    for role, method_name in list(roles.items()):
+    for role, method_name in roles.items():
         setattr(cls, '_sa_%s' % role, getattr(cls, method_name))
 
     setattr(cls, '_sa_instrumented', id(cls))
@@ -1250,7 +1250,7 @@ def _dict_decorators():
         def update(self, __other=Unspecified, **kw):
             if __other is not Unspecified:
                 if hasattr(__other, 'keys'):
-                    for key in list(__other.keys()):
+                    for key in list(__other):
                         if (key not in self or
                             self[key] is not __other[key]):
                             self[key] = __other[key]
diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py
index 0eedea793..8ad1dbe9b 100644
--- a/lib/sqlalchemy/orm/persistence.py
+++ b/lib/sqlalchemy/orm/persistence.py
@@ -803,7 +803,7 @@ class BulkUD(object):
             raise sa_exc.ArgumentError(
                             "Valid strategies for session synchronization "
                             "are %s" % (", ".join(sorted(repr(x)
-                                for x in list(lookup.keys())))))
+                                for x in lookup))))
         else:
             return klass(*arg)
 
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index cbb508cf7..5a4486eef 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -35,7 +35,7 @@ class _SessionClassMethods(object):
     def close_all(cls):
         """Close *all* sessions in memory."""
 
-        for sess in list(_sessions.values()):
+        for sess in _sessions.values():
             sess.close()
 
     @classmethod
@@ -250,7 +250,7 @@ class SessionTransaction(object):
             if s.key:
                 del s.key
 
-        for s, (oldkey, newkey) in list(self._key_switches.items()):
+        for s, (oldkey, newkey) in self._key_switches.items():
             self.session.identity_map.discard(s)
             s.key = oldkey
             self.session.identity_map.replace(s)
@@ -2237,7 +2237,7 @@ class sessionmaker(_SessionClassMethods):
             session = Session()  # invokes sessionmaker.__call__()
 
         """
-        for k, v in list(self.kw.items()):
+        for k, v in self.kw.items():
             local_kw.setdefault(k, v)
         return self.class_(**local_kw)
 
@@ -2256,7 +2256,7 @@ class sessionmaker(_SessionClassMethods):
         return "%s(class_=%r%s)" % (
                     self.__class__.__name__,
                     self.class_.__name__,
-                    ", ".join("%s=%r" % (k, v) for k, v in list(self.kw.items()))
+                    ", ".join("%s=%r" % (k, v) for k, v in self.kw.items())
                 )
 
 _sessions = weakref.WeakValueDictionary()
diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py
index 8fe37e41c..6ade91b3e 100644
--- a/lib/sqlalchemy/orm/state.py
+++ b/lib/sqlalchemy/orm/state.py
@@ -417,7 +417,7 @@ class InstanceState(interfaces._InspectionAttr):
            against this set when a refresh operation occurs.
 
         """
-        return set([k for k, v in list(self.callables.items()) if v is self])
+        return set([k for k, v in self.callables.items() if v is self])
 
     def _instance_dict(self):
         return None
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index e80745c79..4651c71b7 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -359,7 +359,7 @@ class LazyLoader(AbstractRelationshipLoader):
                         )
 
         if self.use_get:
-            for col in list(self._equated_columns.keys()):
+            for col in list(self._equated_columns):
                 if col in self.mapper._equivalent_columns:
                     for c in self.mapper._equivalent_columns[col]:
                         self._equated_columns[c] = self._equated_columns[col]
diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py
index 54b0ebf72..aa5f7836c 100644
--- a/lib/sqlalchemy/orm/unitofwork.py
+++ b/lib/sqlalchemy/orm/unitofwork.py
@@ -342,7 +342,7 @@ class UOWTransaction(object):
                     for dep in convert[edge[1]]:
                         self.dependencies.add((edge[0], dep))
 
-        return set([a for a in list(self.postsort_actions.values())
+        return set([a for a in self.postsort_actions.values()
                     if not a.disabled
                     ]
                 ).difference(cycles)
@@ -461,7 +461,7 @@ class PostSortRec(object):
     def __repr__(self):
         return "%s(%s)" % (
             self.__class__.__name__,
-            ",".join(str(x) for x in list(self.__dict__.values()))
+            ",".join(str(x) for x in self.__dict__.values())
         )