[CalendarServer-changes] [10266] CalendarServer/branches/users/glyph/queue-locking-and-timing

[source_changes at macosforge.org]

Revision: 10266
          http://trac.calendarserver.org//changeset/10266
Author:   glyph at apple.com
Date:     2013-01-04 16:39:31 -0800 (Fri, 04 Jan 2013)
Log Message:
-----------
Fix imports.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/queue-locking-and-timing/twext/enterprise/test/test_util.py
    CalendarServer/branches/users/glyph/queue-locking-and-timing/twext/enterprise/util.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/queue-locking-and-timing/

Modified: CalendarServer/branches/users/glyph/queue-locking-and-timing/twext/enterprise/test/test_util.py
===================================================================
--- CalendarServer/branches/users/glyph/queue-locking-and-timing/twext/enterprise/test/test_util.py	2013-01-05 00:39:30 UTC (rev 10265)
+++ CalendarServer/branches/users/glyph/queue-locking-and-timing/twext/enterprise/test/test_util.py	2013-01-05 00:39:31 UTC (rev 10266)
@@ -16,7 +16,7 @@
 
 import datetime
 
-from twisted.python.unittest import TestCase
+from twisted.trial.unittest import TestCase
 
 from twext.enterprise.util import parseSQLTimestamp
 

Modified: CalendarServer/branches/users/glyph/queue-locking-and-timing/twext/enterprise/util.py
===================================================================
--- CalendarServer/branches/users/glyph/queue-locking-and-timing/twext/enterprise/util.py	2013-01-05 00:39:30 UTC (rev 10265)
+++ CalendarServer/branches/users/glyph/queue-locking-and-timing/twext/enterprise/util.py	2013-01-05 00:39:31 UTC (rev 10266)
@@ -32,7 +32,7 @@
     # Handle case where fraction seconds may not be present
     if len(ts) < len(SQL_TIMESTAMP_FORMAT):
         ts += ".0"
-    return datetime.datetime.strptime(ts, SQL_TIMESTAMP_FORMAT)
+    return datetime.strptime(ts, SQL_TIMESTAMP_FORMAT)
 
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130104/7fc90a51/attachment.html>