[Checkins] SVN: zc.async/branches/1.4.2a1/src/zc/async/ Backport the fix.
Aaron Lehmann
aaron at zope.com
Fri Jul 17 15:16:59 EDT 2009
Log message for revision 101975:
Backport the fix.
Changed:
U zc.async/branches/1.4.2a1/src/zc/async/CHANGES.txt
U zc.async/branches/1.4.2a1/src/zc/async/testing.py
A zc.async/branches/1.4.2a1/src/zc/async/testing.txt
U zc.async/branches/1.4.2a1/src/zc/async/tests.py
-=-
Modified: zc.async/branches/1.4.2a1/src/zc/async/CHANGES.txt
===================================================================
--- zc.async/branches/1.4.2a1/src/zc/async/CHANGES.txt 2009-07-17 19:03:28 UTC (rev 101974)
+++ zc.async/branches/1.4.2a1/src/zc/async/CHANGES.txt 2009-07-17 19:16:58 UTC (rev 101975)
@@ -1,3 +1,14 @@
+=======
+Changes
+=======
+
+1.4.2 (2009-07-17)
+==================
+
+- Fix a bug were zc.async.testing._datetime.now did not accept the same keyword
+ arguments as datetime.datetime, added tests. This is not a mainline release,
+ the 1.5 line proceeds from the code in 1.4.1.
+
1.4.1 (2008-07-30)
==================
Modified: zc.async/branches/1.4.2a1/src/zc/async/testing.py
===================================================================
--- zc.async/branches/1.4.2a1/src/zc/async/testing.py 2009-07-17 19:03:28 UTC (rev 101974)
+++ zc.async/branches/1.4.2a1/src/zc/async/testing.py 2009-07-17 19:16:58 UTC (rev 101975)
@@ -37,11 +37,11 @@
class _datetime(old_datetime):
@classmethod
- def now(klass, tzinfo=None):
- if tzinfo is None:
+ def now(klass, tz=None):
+ if tz is None:
return _now.replace(tzinfo=None)
else:
- return _now.astimezone(tzinfo)
+ return _now.astimezone(tz)
@classmethod
def utcnow(klass):
return _now.replace(tzinfo=None)
Copied: zc.async/branches/1.4.2a1/src/zc/async/testing.txt (from rev 101948, zc.async/trunk/src/zc/async/testing.txt)
===================================================================
--- zc.async/branches/1.4.2a1/src/zc/async/testing.txt (rev 0)
+++ zc.async/branches/1.4.2a1/src/zc/async/testing.txt 2009-07-17 19:16:58 UTC (rev 101975)
@@ -0,0 +1,10 @@
+Testing Edge Case
+=================
+
+This tests that the _datetime class provided in the zc.asynt.testing module
+takes correctly named arguments to its now method.
+
+ >>> import zc.async.testing
+ >>> import datetime
+ >>> dt_now = datetime.datetime.now(tz=None)
+ >>> z_a_t_dt_now = zc.async.testing._datetime.now(tz=None)
Modified: zc.async/branches/1.4.2a1/src/zc/async/tests.py
===================================================================
--- zc.async/branches/1.4.2a1/src/zc/async/tests.py 2009-07-17 19:03:28 UTC (rev 101974)
+++ zc.async/branches/1.4.2a1/src/zc/async/tests.py 2009-07-17 19:16:58 UTC (rev 101975)
@@ -147,6 +147,7 @@
'README_2.txt',
'catastrophes.txt',
'ftesting.txt',
+ 'testing.txt',
'QUICKSTART_1_VIRTUALENV.txt',
setUp=modSetUp, tearDown=modTearDown,
optionflags=doctest.INTERPRET_FOOTNOTES,
More information about the Checkins
mailing list