[CalendarServer-changes] [1075] CalendarServer/branches/users/cdaboo/od-schema-1044/twistedcaldav/ directory/appleopendirectory.py

[source_changes at macosforge.org]

Revision: 1075
          http://trac.macosforge.org/projects/calendarserver/changeset/1075
Author:   wsanchez at apple.com
Date:     2007-01-19 16:20:22 -0800 (Fri, 19 Jan 2007)

Log Message:
-----------
%s will do str(foo) for you

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/od-schema-1044/twistedcaldav/directory/appleopendirectory.py

Modified: CalendarServer/branches/users/cdaboo/od-schema-1044/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/branches/users/cdaboo/od-schema-1044/twistedcaldav/directory/appleopendirectory.py	2007-01-19 20:47:42 UTC (rev 1074)
+++ CalendarServer/branches/users/cdaboo/od-schema-1044/twistedcaldav/directory/appleopendirectory.py	2007-01-20 00:20:22 UTC (rev 1075)
@@ -60,8 +60,8 @@
         """
         try:
             directory = opendirectory.odInit(node)
-        except opendirectory.ODError, ex:
-            log.msg("Open Directory (node=%s) Initialization error: %s" % (node, str(ex)))
+        except opendirectory.ODError, e:
+            log.msg("Open Directory (node=%s) Initialization error: %s" % (node, e))
             raise
 
         self.realmName = node
@@ -96,7 +96,7 @@
         """
 
         # Get MAC address
-        macaddr = os.popen('/sbin/ifconfig en0|grep ether').read().replace('\n','').split()[1]
+        macaddr = os.popen("/sbin/ifconfig en0|grep ether").read().replace("\n", "").split()[1]
         
         # Find a record in /Computers with an ENetAddress attribute value equal to the MAC address
         # and return some useful attributes.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070119/c4620286/attachment.html