Change the way to compute relative paths to avoid the leading .././ when using

relative urls.

pelican/utils.py

@@ -133,8 +133,12 @@ def clean_output_dir(path):
 
 
 def get_relative_path(filename):
-    """Return the relative path to the given filename"""
+    """Return the relative path from the given filename to the root path."""
-    return '../' * filename.count('/') + '.'
+    nslashes = filename.count('/')
+    if nslashes == 0:
+        return '.'
+    else:
+        return '/'.join(['..'] * nslashes)
 
 
 def truncate_html_words(s, num, end_text='...'):

tests/test_utils.py

@@ -51,9 +51,9 @@ class TestUtils(unittest.TestCase):
 
     def test_get_relative_path(self):
 
-        samples = (('/test/test', '../../.'),
+        samples = (('test/test.html', '..'),
-                   ('/test/test/', '../../../.'),
+                   ('test/test/test.html', '../..'),
-                   ('/', '../.'))
+                   ('test.html', '.'))
 
         for value, expected in samples:
             self.assertEquals(utils.get_relative_path(value), expected)

tests/test_webassets.py

@@ -79,7 +79,7 @@ class TestWebAssetsRelativeURLS(TestWebAssets):
             self.check_link_tag(css_file, os.path.join(self.temp_path, f))
 
         self.check_link_tag(
-            '.././theme/gen/style.{0}.min.css'.format(CSS_HASH),
+            '../theme/gen/style.{0}.min.css'.format(CSS_HASH),
             os.path.join(self.temp_path, 'category/yeah.html'))