[CalendarServer-changes] [3927] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 3927
          http://trac.macosforge.org/projects/calendarserver/changeset/3927
Author:   wsanchez at apple.com
Date:     2009-03-27 08:20:36 -0700 (Fri, 27 Mar 2009)
Log Message:
-----------
Fix import

Modified Paths:
--------------
    CalendarServer/trunk/lib-patches/Twisted/twisted.internet._sslverify.patch
    CalendarServer/trunk/lib-patches/Twisted/twisted.mail.pop3client.patch
    CalendarServer/trunk/lib-patches/Twisted/twisted.persisted.sob.patch
    CalendarServer/trunk/lib-patches/Twisted/twisted.spread.pb.patch
    CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch
    CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.stream.patch
    CalendarServer/trunk/lib-patches/Twisted/twisted.words.protocols.jabber.sasl_mechanisms.patch
    CalendarServer/trunk/twistedcaldav/method/report_common.py
    CalendarServer/trunk/twistedcaldav/scheduling/caldav.py

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.internet._sslverify.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.internet._sslverify.patch	2009-03-27 02:28:14 UTC (rev 3926)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.internet._sslverify.patch	2009-03-27 15:20:36 UTC (rev 3927)
@@ -11,7 +11,7 @@
 +try:
 +    from hashlib import md5
 +except ImportError:
-+    import md5.new as md5
++    from md5 import new as md5
  from OpenSSL import SSL, crypto
  
  from twisted.python import reflect, util

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.mail.pop3client.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.mail.pop3client.patch	2009-03-27 02:28:14 UTC (rev 3926)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.mail.pop3client.patch	2009-03-27 15:20:36 UTC (rev 3927)
@@ -12,7 +12,7 @@
 +try:
 +    from hashlib import md5
 +except ImportError:
-+    import md5.new as md5
++    from md5 import new as md5
 +
  from twisted.python import log
  from twisted.internet import defer

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.persisted.sob.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.persisted.sob.patch	2009-03-27 02:28:14 UTC (rev 3926)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.persisted.sob.patch	2009-03-27 15:20:36 UTC (rev 3927)
@@ -11,7 +11,7 @@
  try:
 +    from hashlib import md5
 +except ImportError:
-+    import md5.new as md5
++    from md5 import new as md5
 +try:
      import cPickle as pickle
  except ImportError:

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.spread.pb.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.spread.pb.patch	2009-03-27 02:28:14 UTC (rev 3926)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.spread.pb.patch	2009-03-27 15:20:36 UTC (rev 3927)
@@ -10,7 +10,7 @@
 +try:
 +    from hashlib import md5
 +except ImportError:
-+    import md5.new as md5
++    from md5 import new as md5
 +
  import random
  import new

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch	2009-03-27 02:28:14 UTC (rev 3926)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch	2009-03-27 15:20:36 UTC (rev 3927)
@@ -19,7 +19,7 @@
 +try:
 +    from hashlib import md5, sha1
 +except ImportError:
-+    import md5.new as md5
++    from md5 import new as md5
 +    import sha.new as sha1
  import random, sys
  

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.stream.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.stream.patch	2009-03-27 02:28:14 UTC (rev 3926)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.stream.patch	2009-03-27 15:20:36 UTC (rev 3927)
@@ -40,7 +40,7 @@
 +try:
 +    from hashlib import md5
 +except ImportError:
-+    import md5.new as md5
++    from md5 import new as md5
 +
 +class MD5StreamWrapper(SimpleStream):
 + 

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.words.protocols.jabber.sasl_mechanisms.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.words.protocols.jabber.sasl_mechanisms.patch	2009-03-27 02:28:14 UTC (rev 3926)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.words.protocols.jabber.sasl_mechanisms.patch	2009-03-27 15:20:36 UTC (rev 3927)
@@ -12,7 +12,7 @@
 +try:
 +    from hashlib import md5
 +except ImportError:
-+    import md5.new as md5
++    from md5 import new as md5
 +
  from zope.interface import Interface, Attribute, implements
  

Modified: CalendarServer/trunk/twistedcaldav/method/report_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_common.py	2009-03-27 02:28:14 UTC (rev 3926)
+++ CalendarServer/trunk/twistedcaldav/method/report_common.py	2009-03-27 15:20:36 UTC (rev 3927)
@@ -34,7 +34,7 @@
 try:
     from hashlib import md5
 except ImportError:
-    import md5.new as md5
+    from md5 import new as md5
 
 from vobject.icalendar import utc
 

Modified: CalendarServer/trunk/twistedcaldav/scheduling/caldav.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/caldav.py	2009-03-27 02:28:14 UTC (rev 3926)
+++ CalendarServer/trunk/twistedcaldav/scheduling/caldav.py	2009-03-27 15:20:36 UTC (rev 3927)
@@ -19,7 +19,7 @@
 try:
     from hashlib import md5
 except ImportError:
-    import md5.new as md5
+    from md5 import new as md5
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.python.failure import Failure
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090327/1af25d88/attachment-0001.html>