Issue webcompat#767: normalize_url doesn't break when scheme is properly spelled

Author: daliacoss

tests/test_form.py

@@ -11,6 +11,12 @@ class TestForm(unittest.TestCase):
 
     def test_normalize_url(self):
 
+        r = form.normalize_url('http://example.com')
+        self.assertEqual(r, 'http://example.com')
+
+        r = form.normalize_url('https://example.com')
+        self.assertEqual(r, 'https://example.com')
+
         r = form.normalize_url('example.com')
         self.assertEqual(r, 'http://example.com')
 

webcompat/form.py

@@ -121,22 +121,21 @@ def normalize_url(url):
     url = url.strip()
     parsed = urlparse.urlparse(url)
 
-    if url.startswith(BAD_SCHEMES):
+    if url.startswith(BAD_SCHEMES) and not url.startswith(SCHEMES):
         # if url starts with a bad scheme, parsed.netloc will be empty,
         # so we use parsed.path instead
         path = parsed.path.lstrip('/')
-        url = '%s://%s' % (parsed.scheme, path)
+        url = '{}://{}'.format(parsed.scheme, path)
         if parsed.query:
             url += '?' + parsed.query
         if parsed.fragment:
             url += '#' + parsed.fragment
     elif not parsed.scheme:
         # We assume that http is missing not https
         if url.startswith("//"):
-            url = "http://%s" % (url[2:])
+            url = "http://{}".format(url[2:])
         else:
-            url = 'http://%s' % (url)
-
+            url = 'http://{}'.format(url)
     return url