[CalendarServer-changes] [5402] CalDAVTester/branches/users/cdaboo/sharing-5228/src/caldavtest.py

[source_changes at macosforge.org]

Revision: 5402
          http://trac.macosforge.org/projects/calendarserver/changeset/5402
Author:   cdaboo at apple.com
Date:     2010-03-25 18:46:02 -0700 (Thu, 25 Mar 2010)
Log Message:
-----------
Missed some substitutions.

Modified Paths:
--------------
    CalDAVTester/branches/users/cdaboo/sharing-5228/src/caldavtest.py

Modified: CalDAVTester/branches/users/cdaboo/sharing-5228/src/caldavtest.py
===================================================================
--- CalDAVTester/branches/users/cdaboo/sharing-5228/src/caldavtest.py	2010-03-26 01:45:33 UTC (rev 5401)
+++ CalDAVTester/branches/users/cdaboo/sharing-5228/src/caldavtest.py	2010-03-26 01:46:02 UTC (rev 5402)
@@ -209,6 +209,7 @@
                             rc.append(node)
                 return rc
 
+            request_uri = req.getURI( self.manager.server_info )
             for response in doc.getElementsByTagNameNS( "DAV:", "response" ):
     
                 # Get href for this response
@@ -217,7 +218,7 @@
                     return False, "           Wrong number of DAV:href elements\n"
                 if href[0].firstChild is not None:
                     href = href[0].firstChild.data
-                    if href != req.ruri:
+                    if href != request_uri:
                         hrefs.append((href, collection[1], collection[2]) )
         return hrefs
 
@@ -270,6 +271,7 @@
                 return rc
 
             latest = 0
+            request_uri = req.getURI( self.manager.server_info )
             for response in doc.getElementsByTagNameNS( "DAV:", "response" ):
     
                 # Get href for this response
@@ -278,7 +280,7 @@
                     return False, "           Wrong number of DAV:href elements\n"
                 if href[0].firstChild is not None:
                     href = href[0].firstChild.data
-                    if href != req.ruri:
+                    if href != request_uri:
 
                         # Get all property status
                         propstatus = ElementsByName(response, "DAV:", "propstat")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100325/3bda9b85/attachment-0001.html>