url.flatten_path: Handle '.' & '.'-related paths.

Closes #241

doc/changelog.rst

@@ -6,6 +6,7 @@ What's New
 * Updated certificate bundle.
 * Fixed TypeError crash on bad Meta Refresh HTML element.
 * Fixed unable to fetch FTP files with spaces and other special characters.
+* Fixed AssertionError fetching URLs with trailing dot not properly removed.
 * Added ``--no-cache``.
 * Added ``--report-speed``.
 

wpull/url.py

@@ -666,9 +666,11 @@ def flatten_path(path, flatten_slashes=False):
     '''
     # Based on posixpath.normpath
 
+    # Fast path
     if not path or path == '/':
         return '/'
 
+    # Take off leading slash
     if path[0] == '/':
         path = path[1:]
 
@@ -682,10 +684,12 @@ def flatten_path(path, flatten_slashes=False):
             new_parts.append(part)
         elif new_parts:
             new_parts.pop()
-
-    if flatten_slashes and path.endswith('/'):
+
+    # If the filename is empty string
+    if flatten_slashes and path.endswith('/') or not len(new_parts):
         new_parts.append('')
 
+    # Put back leading slash
     new_parts.appendleft('')
 
     return '/'.join(new_parts)

wpull/url_test.py

@@ -290,6 +290,10 @@ def test_url_info_invalids(self):
             ValueError, URLInfo.parse, 'http://[.]/python.xml%22')
 
     def test_url_info_path_folding(self):
+        self.assertEqual(
+            'http://example.com/',
+            URLInfo.parse('http://example.com/.').url
+        )
         self.assertEqual(
             'http://example.com/',
             URLInfo.parse('http://example.com/../').url
@@ -654,6 +658,12 @@ def test_flatten_path(self):
                                                  flatten_slashes=True))
         self.assertEqual('/a', flatten_path('a'))
         self.assertEqual('/a/', flatten_path('a/'))
+        self.assertEqual('/', flatten_path('.'))
+        self.assertEqual('/', flatten_path('./'))
+        self.assertEqual('/', flatten_path('/.'))
+        self.assertEqual('/', flatten_path('/..'))
+        self.assertEqual('/', flatten_path('../'))
+        self.assertEqual('/', flatten_path('./.'))
         self.assertEqual('/', flatten_path('/'))
         self.assertEqual('/', flatten_path('/../../../'))
         self.assertEqual('/', flatten_path('/.././'))