[CalendarServer-changes] [8069] CalendarServer/branches/users/glyph/other-html/twext/web2

[source_changes at macosforge.org]

Revision: 8069
          http://trac.macosforge.org/projects/calendarserver/changeset/8069
Author:   glyph at apple.com
Date:     2011-09-13 12:09:21 -0700 (Tue, 13 Sep 2011)
Log Message:
-----------
nudge the test a little

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/other-html/twext/web2/dav/test/test_static.py
    CalendarServer/branches/users/glyph/other-html/twext/web2/static.py

Modified: CalendarServer/branches/users/glyph/other-html/twext/web2/dav/test/test_static.py
===================================================================
--- CalendarServer/branches/users/glyph/other-html/twext/web2/dav/test/test_static.py	2011-09-13 19:09:14 UTC (rev 8068)
+++ CalendarServer/branches/users/glyph/other-html/twext/web2/dav/test/test_static.py	2011-09-13 19:09:21 UTC (rev 8069)
@@ -49,7 +49,7 @@
             data = []
             d = readStream(response.stream, lambda s: data.append(str(s)))
             d.addCallback(lambda _: self.failIf(
-                'href="dir2/"' not in "".join(data),
+                'dir2/' not in "".join(data),
                 "'dir2' expected in listing: %r" % (data,)
             ))
             return d

Modified: CalendarServer/branches/users/glyph/other-html/twext/web2/static.py
===================================================================
--- CalendarServer/branches/users/glyph/other-html/twext/web2/static.py	2011-09-13 19:09:14 UTC (rev 8068)
+++ CalendarServer/branches/users/glyph/other-html/twext/web2/static.py	2011-09-13 19:09:21 UTC (rev 8069)
@@ -420,7 +420,8 @@
                     # Directory listing is in twistedcaldav.extensions
                     standin = Data(
                         "\n".join(["Directory: " + str(req.path), "---"] +
-                                  [x.basename() for x in self.fp.children()]),
+                                  [x.basename() + ("/" if x.isdir() else "")
+                                   for x in self.fp.children()]),
                         "text/plain")
                 return standin.render(req)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110913/ece29a5e/attachment-0001.html>