Fix base_url set to a directory name.

With base_url='/a/b', a relative URL 'c' was resolved to '/a/c'.
Now it is resolved to '/a/b/c' if /a/b is a directory, '/a/c'
otherwise. This is most likely the expected behavior.

CHANGES

@@ -13,6 +13,7 @@ Not released yet.
 
   - Handling of filenames and URLs on Windows
   - Unicode filenames with older version of py2cairo
+  - ``base_url`` now behaves as expected when set to a directory name.
   - Make some tests more robust
 
 

weasyprint/urls.py

@@ -69,6 +69,10 @@ def iri_to_uri(url):
 def path2url(path):
     """Return file URL of `path`"""
     path = os.path.abspath(path)
+    if os.path.isdir(path):
+        # Make sure directory names have a trailing slash.
+        # Otherwise relative URIs are resolved from the parent directory.
+        path += os.path.sep
     if isinstance(path, unicode):
         path = path.encode(FILESYSTEM_ENCODING)
     path = pathname2url(path)