[CalendarServer-changes] [11349] CalendarServer/branches/users/glyph/warning-cleanups

[source_changes at macosforge.org]

Revision: 11349
          http://trac.calendarserver.org//changeset/11349
Author:   glyph at apple.com
Date:     2013-06-13 16:21:05 -0700 (Thu, 13 Jun 2013)
Log Message:
-----------
Fix several deprecation warnings.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/warning-cleanups/calendarserver/webadmin/resource.py
    CalendarServer/branches/users/glyph/warning-cleanups/twistedcaldav/directory/calendaruserproxy.py
    CalendarServer/branches/users/glyph/warning-cleanups/twistedcaldav/directory/principal.py
    CalendarServer/branches/users/glyph/warning-cleanups/twistedcaldav/extensions.py

Modified: CalendarServer/branches/users/glyph/warning-cleanups/calendarserver/webadmin/resource.py
===================================================================
--- CalendarServer/branches/users/glyph/warning-cleanups/calendarserver/webadmin/resource.py	2013-06-13 23:20:35 UTC (rev 11348)
+++ CalendarServer/branches/users/glyph/warning-cleanups/calendarserver/webadmin/resource.py	2013-06-13 23:21:05 UTC (rev 11349)
@@ -24,7 +24,6 @@
     "WebAdminPage",
 ]
 
-import cgi
 import operator
 import urlparse
 
@@ -60,7 +59,7 @@
     """
 
     loader = XMLFile(
-        getModule(__name__).filePath.sibling("template.html").open()
+        getModule(__name__).filePath.sibling("template.html")
     )
 
     def __init__(self, resource):
@@ -624,7 +623,8 @@
             return request.args.get(arg, [""])[0]
 
         def queryValues(arg):
-            query = cgi.parse_qs(urlparse.urlparse(request.uri).query, True)
+            query = urlparse.parse_qs(urlparse.urlparse(request.uri).query,
+                                      True)
             matches = []
             for key in query.keys():
                 if key.startswith(arg):

Modified: CalendarServer/branches/users/glyph/warning-cleanups/twistedcaldav/directory/calendaruserproxy.py
===================================================================
--- CalendarServer/branches/users/glyph/warning-cleanups/twistedcaldav/directory/calendaruserproxy.py	2013-06-13 23:20:35 UTC (rev 11348)
+++ CalendarServer/branches/users/glyph/warning-cleanups/twistedcaldav/directory/calendaruserproxy.py	2013-06-13 23:21:05 UTC (rev 11349)
@@ -103,7 +103,7 @@
     """
 
     loader = XMLFile(thisModule.filePath.sibling(
-        "calendar-user-proxy-principal-resource.html").open()
+        "calendar-user-proxy-principal-resource.html")
     )
 
     def __init__(self, resource):

Modified: CalendarServer/branches/users/glyph/warning-cleanups/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/users/glyph/warning-cleanups/twistedcaldav/directory/principal.py	2013-06-13 23:20:35 UTC (rev 11348)
+++ CalendarServer/branches/users/glyph/warning-cleanups/twistedcaldav/directory/principal.py	2013-06-13 23:21:05 UTC (rev 11349)
@@ -581,7 +581,7 @@
     """
 
     loader = XMLFile(thisModule.filePath.sibling(
-        "directory-principal-resource.html").open()
+        "directory-principal-resource.html")
     )
 
 

Modified: CalendarServer/branches/users/glyph/warning-cleanups/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/branches/users/glyph/warning-cleanups/twistedcaldav/extensions.py	2013-06-13 23:20:35 UTC (rev 11348)
+++ CalendarServer/branches/users/glyph/warning-cleanups/twistedcaldav/extensions.py	2013-06-13 23:21:05 UTC (rev 11349)
@@ -344,7 +344,7 @@
     """
 
     loader = XMLFile(
-        thisModule.filePath.sibling("directory-listing.html").open()
+        thisModule.filePath.sibling("directory-listing.html")
     )
 
     def __init__(self, resource):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130613/34e7781a/attachment-0001.html>