diff options
| -rw-r--r-- | lib/sqlalchemy/orm/mapper.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/unitofwork.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/uowdumper.py | 3 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/util.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/topological.py | 3 | ||||
| -rw-r--r-- | lib/sqlalchemy/util.py | 10 |
6 files changed, 7 insertions, 19 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index aec4e1dff..c0fd1c550 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -1175,7 +1175,7 @@ class Mapper(object): # synchronize newly inserted ids from one table to the next # TODO: this fires off more than needed, try to organize syncrules # per table - for m in util.reversed(list(mapper.iterate_to_root())): + for m in reversed(list(mapper.iterate_to_root())): if m.__inherits_equated_pairs: m.__synchronize_inherited(state) @@ -1562,7 +1562,7 @@ class Mapper(object): allconds = [] start = False - for mapper in util.reversed(list(self.iterate_to_root())): + for mapper in reversed(list(self.iterate_to_root())): if mapper.local_table in tables: start = True if start and not mapper.single: diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py index 9a008e5cb..b4e649262 100644 --- a/lib/sqlalchemy/orm/unitofwork.py +++ b/lib/sqlalchemy/orm/unitofwork.py @@ -755,7 +755,7 @@ class UOWExecutor(object): for task in tasks: self.execute_save_steps(trans, task) if isdelete is not False: - for task in util.reversed(tasks): + for task in reversed(tasks): self.execute_delete_steps(trans, task) def save_objects(self, trans, task): @@ -782,7 +782,7 @@ class UOWExecutor(object): for dep in task.polymorphic_dependencies: self.execute_dependency(trans, dep, False) if isdelete is not False: - for dep in util.reversed(list(task.polymorphic_dependencies)): + for dep in reversed(list(task.polymorphic_dependencies)): self.execute_dependency(trans, dep, True) def execute_cyclical_dependencies(self, trans, task, isdelete): diff --git a/lib/sqlalchemy/orm/uowdumper.py b/lib/sqlalchemy/orm/uowdumper.py index 09b82167d..43461885d 100644 --- a/lib/sqlalchemy/orm/uowdumper.py +++ b/lib/sqlalchemy/orm/uowdumper.py @@ -6,7 +6,6 @@ """Dumps out a string representation of a UOWTask structure""" -from sqlalchemy import util from sqlalchemy.orm import unitofwork from sqlalchemy.orm import util as mapperutil @@ -22,7 +21,7 @@ class UOWDumper(unitofwork.UOWExecutor): for task in tasks: self._execute(trans, task, False) if isdelete is not False: - for task in util.reversed(tasks): + for task in reversed(tasks): self._execute(trans, task, True) def _execute(self, trans, task, isdelete): diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py index c09744393..66ad3d32d 100644 --- a/lib/sqlalchemy/sql/util.py +++ b/lib/sqlalchemy/sql/util.py @@ -20,7 +20,7 @@ def sort_tables(tables, reverse=False): visitors.traverse(table, {'schema_visitor':True}, {'foreign_key':visit_foreign_key}) sequence = topological.sort(tuples, tables) if reverse: - return util.reversed(sequence) + return reversed(sequence) else: return sequence diff --git a/lib/sqlalchemy/topological.py b/lib/sqlalchemy/topological.py index bfcfc9c0a..e46b41a49 100644 --- a/lib/sqlalchemy/topological.py +++ b/lib/sqlalchemy/topological.py @@ -18,7 +18,6 @@ conditions. """ -from sqlalchemy import util from sqlalchemy.exc import CircularDependencyError __all__ = ['sort', 'sort_with_cycles', 'sort_as_tree'] @@ -237,7 +236,7 @@ def _organize_as_tree(nodes): # order of the list has no semantics for the algorithmic independents = [] # in reverse topological order - for node in util.reversed(nodes): + for node in reversed(nodes): # nodes subtree and cycles contain the node itself subtree = set([node]) if node.cycles is not None: diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py index a100d931d..ee2840cf5 100644 --- a/lib/sqlalchemy/util.py +++ b/lib/sqlalchemy/util.py @@ -28,16 +28,6 @@ except ImportError: import pickle try: - reversed = __builtin__.reversed -except AttributeError: - def reversed(seq): - i = len(seq) -1 - while i >= 0: - yield seq[i] - i -= 1 - raise StopIteration() - -try: # Try the standard decimal for > 2.3 or the compatibility module # for 2.3, if installed. from decimal import Decimal |