[CalendarServer-changes] [10692] CalendarServer/trunk/twext/who

[source_changes at macosforge.org]

Revision: 10692
          http://trac.calendarserver.org//changeset/10692
Author:   wsanchez at apple.com
Date:     2013-02-11 15:52:11 -0800 (Mon, 11 Feb 2013)
Log Message:
-----------
Use cool kids' syntax

Modified Paths:
--------------
    CalendarServer/trunk/twext/who/test/test_directory.py
    CalendarServer/trunk/twext/who/xml.py

Modified: CalendarServer/trunk/twext/who/test/test_directory.py
===================================================================
--- CalendarServer/trunk/twext/who/test/test_directory.py	2013-02-11 23:49:03 UTC (rev 10691)
+++ CalendarServer/trunk/twext/who/test/test_directory.py	2013-02-11 23:52:11 UTC (rev 10692)
@@ -47,7 +47,7 @@
         service = self._testService()
         try:
             verifyObject(IDirectoryService, service)
-        except BrokenMethodImplementation, e:
+        except BrokenMethodImplementation as e:
             self.fail(e)
 
 
@@ -130,7 +130,7 @@
         record = self._testRecord()
         try:
             verifyObject(IDirectoryRecord, record)
-        except BrokenMethodImplementation, e:
+        except BrokenMethodImplementation as e:
             self.fail(e)
 
 

Modified: CalendarServer/trunk/twext/who/xml.py
===================================================================
--- CalendarServer/trunk/twext/who/xml.py	2013-02-11 23:49:03 UTC (rev 10691)
+++ CalendarServer/trunk/twext/who/xml.py	2013-02-11 23:52:11 UTC (rev 10692)
@@ -220,7 +220,7 @@
 
             try:
                 etree = parseXML(fh)
-            except XMLParseError, e:
+            except XMLParseError as e:
                 raise DirectoryServiceError(e.getMessage())
         finally:
             fh.close()
@@ -245,7 +245,7 @@
         for recordNode in directoryNode:
             try:
                 records.add(self.parseRecordNode(recordNode, unknownFieldElements))
-            except UnknownRecordTypeError, e:
+            except UnknownRecordTypeError as e:
                 unknownRecordTypes.add(e.token)
 
         #
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130211/c0145352/attachment.html>