Rename for clarity

src/nti/transactions/tests/test_transaction.py

@@ -25,7 +25,7 @@
 from nti.transactions.interfaces import AbortFailedError
 
 from nti.transactions.transactions import do
-from nti.transactions.transactions import do_last
+from nti.transactions.transactions import do_near_end
 from nti.transactions.transactions import _do_commit
 from nti.transactions.transactions import TransactionLoop
 
@@ -235,7 +235,7 @@ def test_call(x):
         # except for the one that requests to go last.
         manager1 = do(call=test_call, args=(0,))
         manager2 = do(call=test_call, args=(1,))
-        manager_post = do_last(call=test_call, args=(10,))
+        manager_post = do_near_end(call=test_call, args=(10,))
         manager3 = do(call=test_call, args=(2,))
         transaction.commit()
         assert_that(results, contains(0,1,2,10))

src/nti/transactions/transactions.py

@@ -196,7 +196,7 @@ def rollback(self):
         # anyway.
         pass
 
-class ExecuteLastObjectDataManager(ObjectDataManager):
+class OrderedNearEndObjectDataManager(ObjectDataManager):
     """
     A special extension of :class:`ObjectDataManager` that attempts to execute
     after all other data managers have executed. This is useful when an
@@ -208,7 +208,7 @@ def sortKey(self):
         Sort prepended with z's in an attempt to execute after other data
         managers.
         """
-        parent_key = super(ExecuteLastObjectDataManager, self).sortKey()
+        parent_key = super(OrderedNearEndObjectDataManager, self).sortKey()
         sort_str = str(self.target) if self.target is not None else str(self.callable)
         return 'zzz%s:%s' % (sort_str, parent_key)
 
@@ -249,19 +249,19 @@ def do(*args, **kwargs):
     Establishes a IDataManager in the current transaction.
     See :class:`ObjectDataManager` for the possible arguments.
     """
-    result = ObjectDataManager(*args, **kwargs)
+    klass = kwargs.pop('datamanager_class', ObjectDataManager)
+    result = klass(*args, **kwargs)
     transaction.get().join(result)
     return result
 
-def do_last(*args, **kwargs):
+def do_near_end(*args, **kwargs):
     """
     Establishes a IDataManager in the current transaction that will attempt to
     execute *after* all other DataManagers have had their say.
     See :class:`ObjectDataManager` for the possible arguments.
     """
-    result = ExecuteLastObjectDataManager(*args, **kwargs)
-    transaction.get().join(result)
-    return result
+    kwargs['datamanager_class'] = OrderedNearEndObjectDataManager
+    return do(*args, **kwargs)
 
 def _do_commit(tx, description, long_commit_duration):
     exc_info = sys.exc_info()