[CalendarServer-changes] [3928] CalendarServer/trunk/lib-patches/Twisted
source_changes at macosforge.org
source_changes at macosforge.org
Fri Mar 27 08:22:07 PDT 2009
Revision: 3928
http://trac.macosforge.org/projects/calendarserver/changeset/3928
Author: wsanchez at apple.com
Date: 2009-03-27 08:22:06 -0700 (Fri, 27 Mar 2009)
Log Message:
-----------
Fix import
Modified Paths:
--------------
CalendarServer/trunk/lib-patches/Twisted/twisted.python.filepath.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch
Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.python.filepath.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.python.filepath.patch 2009-03-27 15:20:36 UTC (rev 3927)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.python.filepath.patch 2009-03-27 15:22:06 UTC (rev 3928)
@@ -12,7 +12,7 @@
+try:
+ from hashlib import sha1
+except ImportError:
-+ import sha.new as sha1
++ from sha import new as sha1
+
from os.path import isabs, exists, normpath, abspath, splitext
from os.path import basename, dirname
Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch 2009-03-27 15:20:36 UTC (rev 3927)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch 2009-03-27 15:22:06 UTC (rev 3928)
@@ -20,7 +20,7 @@
+ from hashlib import md5, sha1
+except ImportError:
+ from md5 import new as md5
-+ import sha.new as sha1
++ from sha import new as sha1
import random, sys
# The digest math
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090327/acd98396/attachment-0001.html>
More information about the calendarserver-changes
mailing list