Merge lp:~divmod-dev/divmod.org/1208304-cssutils-api into lp:divmod.org

[Tristan Seligmann]

[Jonathan Jacobs (jjacobs)]

Doesn't this break compatibility with the previous version of cssutils? I think you might want to write your own replaceUrls in the case where replaceUrls cannot be imported from cssutils.

review: Needs Information

[Tristan Seligmann (mithrandi)]

The change in question was made in cssutils 0.9.5b1, released in 2008. This is older than the version in Debian squeeze, so it is unlikely that anyone is using Mantissa with a version of cssutils that still has the old API; thus I don't think there's much point in introducing fallback logic.

Unmerged revisions

2712. By Tristan Seligmann on 2013-08-05

Use the new API.

=== modified file 'Mantissa/xmantissa/website.py'
--- Mantissa/xmantissa/website.py	2009-07-08 01:51:14 +0000
+++ Mantissa/xmantissa/website.py	2013-08-05 03:37:23 +0000
@@ -14,7 +14,7 @@
 from zope.interface import implements
 
 try:
-    from cssutils import CSSParser
+    from cssutils import CSSParser, replaceUrls
     CSSParser
 except ImportError:
     CSSParser = None
@@ -476,7 +476,7 @@
         stylesheet = ''.join(self._buffer)
         parser = CSSParser()
         css = parser.parseString(stylesheet)
-        css.replaceUrls(self._replace)
+        replaceUrls(css, self._replace)
         self.request.write(css.cssText)
         return self.request.finish()