Move create_url() function

Author: schedutron

app/api/helpers/storage.py

@@ -167,6 +167,20 @@ def upload_local(uploaded_file, key, **kwargs):
     return create_url(request.url, file_relative_path)
 
 
+def create_url(request_url, file_relative_path):
+    """Generates the URL of an uploaded file."""
+    url = urlparse(request_url)
+
+    # No need to specify scheme-corresponding port
+    port = url.port
+    if port and url.scheme == SCHEMES.get(url.port, None):
+        port = None
+
+    return '{scheme}://{hostname}:{port}{file_relative_path}'.format(
+        scheme=url.scheme, hostname=url.hostname, port=port,
+        file_relative_path=file_relative_path).replace(':None', '')
+
+
 def upload_to_aws(bucket_name, aws_region, aws_key, aws_secret, file, key, acl='public-read'):
     """
     Uploads to AWS at key
@@ -252,17 +266,3 @@ def generate_hash(key):
     """
     phash = generate_password_hash(key, get_settings()['secret'])
     return str(b64encode(phash), 'utf-8')[:10]  # limit len to 10, is sufficient
-
-
-def create_url(request_url, file_relative_path):
-    """Generates the URL of an uploaded file."""
-    url = urlparse(request_url)
-
-    # No need to specify scheme-corresponding port
-    port = url.port
-    if port and url.scheme == SCHEMES.get(url.port, None):
-        port = None
-
-    return '{scheme}://{hostname}:{port}{file_relative_path}'.format(
-        scheme=url.scheme, hostname=url.hostname, port=port,
-        file_relative_path=file_relative_path).replace(':None', '')

tests/unittests/api/helpers/test_storage.py

@@ -17,7 +17,7 @@ def test_arbitrary_url(self):
         self.assertEqual(
             create_url(request_url, file_relative_path), expected_file_url
             )
-    
+
     def test_http_url(self):
         """Method to test a url with port 80."""
         request_url = 'http://localhost:80'