[Checkins] SVN: zc.async/trunk/src/zc/async/ - merge jackie-python-64bit branch to make tests pass on 64 bit Python.
John Murphy
jackie at zope.com
Wed Nov 11 09:30:58 EST 2009
Log message for revision 105582:
- merge jackie-python-64bit branch to make tests pass on 64 bit Python.
svn merge svn+ssh://svn.zope.org/repos/main/zc.async/branches/jackie-python-64bit -r105565:105566 .
Changed:
U zc.async/trunk/src/zc/async/CHANGES.txt
U zc.async/trunk/src/zc/async/utils.py
-=-
Modified: zc.async/trunk/src/zc/async/CHANGES.txt
===================================================================
--- zc.async/trunk/src/zc/async/CHANGES.txt 2009-11-11 09:08:37 UTC (rev 105581)
+++ zc.async/trunk/src/zc/async/CHANGES.txt 2009-11-11 14:30:57 UTC (rev 105582)
@@ -18,6 +18,9 @@
- Make the ftesting.txt test exercise the 'zc.async' logger in
addition to 'zc.async.event'.
+- zc.async.utils.dt_to_long coerces return value to long (test pass on 64-bit
+ Python).
+
1.5.2 (2009-07-22)
==================
Modified: zc.async/trunk/src/zc/async/utils.py
===================================================================
--- zc.async/trunk/src/zc/async/utils.py 2009-11-11 09:08:37 UTC (rev 105581)
+++ zc.async/trunk/src/zc/async/utils.py 2009-11-11 14:30:57 UTC (rev 105582)
@@ -102,7 +102,8 @@
if dt.tzinfo is not None:
dt = dt.astimezone(pytz.UTC).replace(tzinfo=None)
delta = datetime.datetime.max - dt
- return (delta.days << 41 | delta.seconds << 24 | delta.microseconds << 4)
+ return long((delta.days << 41 | delta.seconds << 24 |
+ delta.microseconds << 4))
def long_to_dt(l):
microseconds = (l >> 4) & (2**20-1)
More information about the checkins
mailing list