[Checkins] SVN: zc.async/trunk/src/zc/async/ - merge jackie-python-26 branch to make tests pass on Python 2.6
John Murphy
jackie at zope.com
Wed Nov 11 09:40:09 EST 2009
Log message for revision 105583:
- merge jackie-python-26 branch to make tests pass on Python 2.6
svn merge svn+ssh://svn.zope.org/repos/main/zc.async/branches/jackie-python-26 -r105567:105571 .
Changed:
U zc.async/trunk/src/zc/async/CHANGES.txt
U zc.async/trunk/src/zc/async/README_1.txt
U zc.async/trunk/src/zc/async/catastrophes.txt
U zc.async/trunk/src/zc/async/dispatcher.txt
U zc.async/trunk/src/zc/async/job.txt
U zc.async/trunk/src/zc/async/tests.py
-=-
Modified: zc.async/trunk/src/zc/async/CHANGES.txt
===================================================================
--- zc.async/trunk/src/zc/async/CHANGES.txt 2009-11-11 14:30:57 UTC (rev 105582)
+++ zc.async/trunk/src/zc/async/CHANGES.txt 2009-11-11 14:40:08 UTC (rev 105583)
@@ -21,6 +21,8 @@
- zc.async.utils.dt_to_long coerces return value to long (test pass on 64-bit
Python).
+- Tests pass on Python 2.6
+
1.5.2 (2009-07-22)
==================
Modified: zc.async/trunk/src/zc/async/README_1.txt
===================================================================
--- zc.async/trunk/src/zc/async/README_1.txt 2009-11-11 14:30:57 UTC (rev 105582)
+++ zc.async/trunk/src/zc/async/README_1.txt 2009-11-11 14:40:08 UTC (rev 105583)
@@ -305,7 +305,7 @@
>>> reactor.wait_for(job)
>>> t = transaction.begin()
>>> job.result
- <zc.twist.Failure exceptions.NameError>
+ <zc.twist.Failure ...exceptions.NameError...>
Failures can provide useful information such as tracebacks.
@@ -359,7 +359,7 @@
>>> transaction.commit()
>>> reactor.wait_for(job)
>>> job.result
- <zc.twist.Failure exceptions.NameError>
+ <zc.twist.Failure ...exceptions.NameError...>
>>> callback1.result
'I handled a name error'
>>> callback2.result
@@ -918,7 +918,7 @@
>>> transaction.commit()
>>> reactor.wait_for(job)
>>> job.result
- <zc.twist.Failure zc.async.interfaces.TimeoutError>
+ <zc.twist.Failure ...zc.async.interfaces.TimeoutError...>
>>> import sys
>>> job.result.printTraceback(sys.stdout) # doctest: +NORMALIZE_WHITESPACE
Traceback (most recent call last):
Modified: zc.async/trunk/src/zc/async/catastrophes.txt
===================================================================
--- zc.async/trunk/src/zc/async/catastrophes.txt 2009-11-11 14:30:57 UTC (rev 105582)
+++ zc.async/trunk/src/zc/async/catastrophes.txt 2009-11-11 14:40:08 UTC (rev 105583)
@@ -462,7 +462,7 @@
>>> transaction.commit()
>>> pprint.pprint(zc.async.testing.get_poll(dispatcher)) # doctest: +ELLIPSIS
{'': {'main': {'active jobs': [],
- 'error': <zc.twist.Failure ...ClientDisconnected>,
+ 'error': <zc.twist.Failure ...ClientDisconnected...>,
'len': 0,
'new jobs': [],
'size': 3}}}
Modified: zc.async/trunk/src/zc/async/dispatcher.txt
===================================================================
--- zc.async/trunk/src/zc/async/dispatcher.txt 2009-11-11 14:30:57 UTC (rev 105582)
+++ zc.async/trunk/src/zc/async/dispatcher.txt 2009-11-11 14:40:08 UTC (rev 105583)
@@ -538,7 +538,7 @@
>>> transaction.commit()
>>> wait_for_result(bad_job)
- <zc.twist.Failure exceptions.TypeError>
+ <zc.twist.Failure ...exceptions.TypeError...>
>>> for r in reversed(event_logs.records):
... if r.levelname == 'ERROR':
Modified: zc.async/trunk/src/zc/async/job.txt
===================================================================
--- zc.async/trunk/src/zc/async/job.txt 2009-11-11 14:30:57 UTC (rev 105582)
+++ zc.async/trunk/src/zc/async/job.txt 2009-11-11 14:40:08 UTC (rev 105583)
@@ -106,7 +106,7 @@
>>> transaction.commit()
>>> res = j()
>>> j.result
- <zc.twist.Failure exceptions.RuntimeError>
+ <zc.twist.Failure ...exceptions.RuntimeError...>
These are standard twisted Failures, except that frames in the stored
traceback have been converted to reprs, so that we don't keep references
@@ -318,7 +318,7 @@
>>> j.addCallbacks(success, failure) # doctest: +ELLIPSIS
<zc.async.job.SuccessFailureCallbackProxy ...>
>>> res = j() # doctest: +ELLIPSIS
- failure. [Failure instance: Traceback: exceptions.TypeError...]
+ failure. [Failure instance: Traceback: ...exceptions.TypeError...]
[#errback_log]_ You can also add multiple callbacks.
@@ -345,8 +345,8 @@
>>> j.addCallbacks(failure=also_failure) # doctest: +ELLIPSIS
<zc.async.job.SuccessFailureCallbackProxy ...>
>>> res = j() # doctest: +ELLIPSIS
- failure. [Failure instance: Traceback: exceptions.TypeError...]
- also a failure. [Failure instance: Traceback: exceptions.TypeError...]
+ failure. [Failure instance: Traceback: ...exceptions.TypeError...]
+ also a failure. [Failure instance: Traceback: ...exceptions.TypeError...]
------------------
Chaining Callbacks
@@ -878,9 +878,9 @@
>>> job = root['j'] = zc.async.job.Job(raiseAnError, ValueError)
>>> transaction.commit()
>>> job()
- <zc.twist.Failure exceptions.ValueError>
+ <zc.twist.Failure ...exceptions.ValueError...>
>>> job.result
- <zc.twist.Failure exceptions.ValueError>
+ <zc.twist.Failure ...exceptions.ValueError...>
>>> count
1
>>> count = 0
@@ -888,9 +888,9 @@
>>> job = root['j'] = zc.async.job.Job(raiseAnError, TypeError)
>>> transaction.commit()
>>> job()
- <zc.twist.Failure exceptions.TypeError>
+ <zc.twist.Failure ...exceptions.TypeError...>
>>> job.result
- <zc.twist.Failure exceptions.TypeError>
+ <zc.twist.Failure ...exceptions.TypeError...>
>>> count
1
>>> count = 0
@@ -898,9 +898,9 @@
>>> job = root['j'] = zc.async.job.Job(raiseAnError, RuntimeError)
>>> transaction.commit()
>>> job()
- <zc.twist.Failure exceptions.RuntimeError>
+ <zc.twist.Failure ...exceptions.RuntimeError...>
>>> job.result
- <zc.twist.Failure exceptions.RuntimeError>
+ <zc.twist.Failure ...exceptions.RuntimeError...>
>>> count
1
>>> count = 0
@@ -913,9 +913,9 @@
... ZODB.POSException.ConflictError)
>>> transaction.commit()
>>> job()
- <zc.twist.Failure ZODB.POSException.ConflictError>
+ <zc.twist.Failure ...ZODB.POSException.ConflictError...>
>>> job.result
- <zc.twist.Failure ZODB.POSException.ConflictError>
+ <zc.twist.Failure ...ZODB.POSException.ConflictError...>
>>> count
5
>>> count = 0
@@ -1088,7 +1088,7 @@
>>> transaction.commit()
>>> j()
tried 2 time(s). committing.
- <zc.twist.Failure exceptions.ValueError>
+ <zc.twist.Failure ...exceptions.ValueError...>
>>> count
1
@@ -1112,7 +1112,7 @@
>>> transaction.commit()
>>> j()
tried 2 time(s). committing.
- <zc.twist.Failure exceptions.ValueError>
+ <zc.twist.Failure ...exceptions.ValueError...>
>>> found = []
>>> for r in reversed(event_logs.records):
... if r.levelname == 'ERROR':
@@ -1144,7 +1144,7 @@
>>> transaction.commit()
>>> j()
tried 6 time(s). committing.
- <zc.twist.Failure ZODB.POSException.ConflictError>
+ <zc.twist.Failure ...ZODB.POSException.ConflictError...>
>>> count
5
@@ -1257,7 +1257,7 @@
>>> transaction.commit()
>>> j()
tried 50 time(s). committing.
- <zc.twist.Failure ZODB.POSException.ConflictError>
+ <zc.twist.Failure ...ZODB.POSException.ConflictError...>
>>> count
5
@@ -1307,7 +1307,7 @@
>>> j.status == zc.async.interfaces.COMPLETED
True
>>> j.result
- <zc.twist.Failure zc.async.interfaces.AbortedError>
+ <zc.twist.Failure ...zc.async.interfaces.AbortedError...>
If the retry policy returns True, as happens above, this should be interpreted
by the agent and queue as a request to immediately reschedule the job. The
@@ -1772,7 +1772,7 @@
>>> root['demo'].counter # it was not rolled back automatically
2
>>> j.result
- <zc.twist.Failure exceptions.RuntimeError>
+ <zc.twist.Failure ...exceptions.RuntimeError...>
>>> print j.result.getTraceback() # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
Traceback (most recent call last):
...
@@ -2064,6 +2064,6 @@
... zc.async.job.Job(call, j)).addCallbacks(failure=failure)
>>> transaction.commit()
>>> res = j() # doctest: +ELLIPSIS
- failure. [Failure instance: Traceback: zc.async.interfaces.BadStatusError...]
+ failure. [Failure instance: Traceback: ...zc.async.interfaces.BadStatusError...]
>>> j.result # the main job still ran to completion
12
Modified: zc.async/trunk/src/zc/async/tests.py
===================================================================
--- zc.async/trunk/src/zc/async/tests.py 2009-11-11 14:30:57 UTC (rev 105582)
+++ zc.async/trunk/src/zc/async/tests.py 2009-11-11 14:40:08 UTC (rev 105583)
@@ -153,7 +153,7 @@
'testing.txt',
'QUICKSTART_1_VIRTUALENV.txt',
setUp=modSetUp, tearDown=modTearDown,
- optionflags=doctest.INTERPRET_FOOTNOTES,
+ optionflags=doctest.INTERPRET_FOOTNOTES|doctest.ELLIPSIS,
checker = renormalizing.RENormalizing([ # used by QUICKSTART only
(re.compile('\d+\.\d+'), '1216179006.856108')])),
))
More information about the checkins
mailing list