[Checkins] SVN: transaction/branches/chrism-job/transaction/ get rid of manager argument

[Chris McDonough]

Log message for revision 124929:
  get rid of manager argument

Changed:
  U   transaction/branches/chrism-job/transaction/_manager.py
  U   transaction/branches/chrism-job/transaction/tests/test_manager.py

-=-
Modified: transaction/branches/chrism-job/transaction/_manager.py
===================================================================
--- transaction/branches/chrism-job/transaction/_manager.py	2012-04-04 06:46:51 UTC (rev 124928)
+++ transaction/branches/chrism-job/transaction/_manager.py	2012-04-04 07:59:18 UTC (rev 124929)
@@ -119,12 +119,9 @@
             if (should_retry is not None) and should_retry(error):
                 return True
 
-    def job(self, func=None, retries=0, manager=None):
-        if manager is None:
-            manager = self
-            
+    def job(self, func=None, retries=0):
         if func is None:
-            return lambda f: self.job(f, retries, manager)
+            return lambda f: self.job(f, retries)
 
         @functools.wraps(func)
         def wrapper():
@@ -135,7 +132,7 @@
                 note = func.__name__
 
             for i in range(retries + 1):
-                t = manager.begin()
+                t = self.begin()
                 if i:
                     t.note("%s (retry: %s)" % (note, i))
                 else:

Modified: transaction/branches/chrism-job/transaction/tests/test_manager.py
===================================================================
--- transaction/branches/chrism-job/transaction/tests/test_manager.py	2012-04-04 06:46:51 UTC (rev 124928)
+++ transaction/branches/chrism-job/transaction/tests/test_manager.py	2012-04-04 07:59:18 UTC (rev 124929)
@@ -113,12 +113,11 @@
                          ['func', 'func (retry: 1)', 'func (retry: 2)'])
         self.assertEqual(self.txn.committed, 1)
 
-    def test_job_other_transaction_manager(self):
-        inst = self._makeOne()
+    def test_as_decorator(self):
         L = []
         manager = self._makeOne()
         manager.begin = self.begin
-        @inst.job(manager=manager)
+        @manager.job()
         def func(tx):
             L.append(1)
         func()