[Checkins] SVN: hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/ generated URLs do never end in a slash to make concating paths more uniform

Jan-Wijbrand Kolman janwijbrand at gmail.com
Wed Nov 24 06:45:52 EST 2010


Log message for revision 118549:
  generated URLs do never end in a slash to make concating paths more uniform

Changed:
  U   hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/core.py
  U   hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/wsgi.py

-=-
Modified: hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/core.py
===================================================================
--- hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/core.py	2010-11-24 11:45:13 UTC (rev 118548)
+++ hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/core.py	2010-11-24 11:45:52 UTC (rev 118549)
@@ -218,7 +218,7 @@
         return inclusions
 
     def library_url(self, library):
-        return '%s/%s/%s/%s/' % (
+        return '%s/%s/%s/%s' % (
             self.base_url,
             self.publisher_signature,
             library.signature(dev_mode=self.devmode),
@@ -239,7 +239,8 @@
                 library_url = url_cache[library.name] = self.library_url(
                     library)
             result.append(
-                render_inclusion(inclusion, library_url + inclusion.relpath))
+                render_inclusion(
+                    inclusion, '%s/%s' %(library_url, inclusion.relpath)))
         return '\n'.join(result)
 
     def render_into_html(self, html):

Modified: hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/wsgi.py
===================================================================
--- hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/wsgi.py	2010-11-24 11:45:13 UTC (rev 118548)
+++ hurry.resource/branches/janjaapdriessen-resource-publisher/src/hurry/resource/wsgi.py	2010-11-24 11:45:52 UTC (rev 118549)
@@ -1,5 +1,5 @@
 import webob
-from paste.deploy.converters import asbool
+from paste.util.converters import asbool
 import hurry.resource
 
 # TODO: would be nice to make middleware smarter so it could work with



More information about the checkins mailing list