Removing upload boolean from JSONConnection.

Author: dhermes

gcloud/connection.py

@@ -119,8 +119,8 @@ class JSONConnection(Connection):
     """A template for the URL of a particular API call."""
 
     @classmethod
-    def build_api_url(cls, path, query_params=None, api_base_url=None,
-                      api_version=None, upload=False):
+    def build_api_url(cls, path, query_params=None,
+                      api_base_url=None, api_version=None):
         """Construct an API url given a few components, some optional.
 
         Typically, you shouldn't need to use this method.
@@ -141,15 +141,10 @@ def build_api_url(cls, path, query_params=None, api_base_url=None,
                             Typically you shouldn't provide this and instead
                             use the default for the library.
 
-        :type upload: boolean
-        :param upload: True if the URL is for uploading purposes.
-
         :rtype: string
         :returns: The URL assembled from the pieces provided.
         """
         api_base_url = api_base_url or cls.API_BASE_URL
-        if upload:
-            api_base_url += '/upload'
 
         url = cls.API_URL_TEMPLATE.format(
             api_base_url=(api_base_url or cls.API_BASE_URL),

gcloud/storage/blob.py

@@ -334,17 +334,19 @@ def upload_from_file(self, file_obj, rewind=False, size=None,
         upload_config = _UploadConfig()
 
         # Temporary URL, until we know simple vs. resumable.
-        upload_url = conn.build_api_url(
-            path=self.bucket.path + '/o', upload=True)
+        base_url = conn.API_BASE_URL + '/upload'
+        upload_url = conn.build_api_url(api_base_url=base_url,
+                                        path=self.bucket.path + '/o')
 
         # Use apitools 'Upload' facility.
         request = http_wrapper.Request(upload_url, 'POST', headers)
 
         upload.ConfigureRequest(upload_config, request, url_builder)
         query_params = url_builder.query_params
-        request.url = conn.build_api_url(path=self.bucket.path + '/o',
-                                         query_params=query_params,
-                                         upload=True)
+        base_url = conn.API_BASE_URL + '/upload'
+        request.url = conn.build_api_url(api_base_url=base_url,
+                                         path=self.bucket.path + '/o',
+                                         query_params=query_params)
         upload.InitializeUpload(request, conn.http)
 
         # Should we be passing callbacks through from caller?  We can't

gcloud/storage/test_blob.py

@@ -1014,13 +1014,11 @@ def api_request(self, **kw):
         return result
 
     def build_api_url(self, path, query_params=None,
-                      api_base_url=API_BASE_URL, upload=False):
+                      api_base_url=API_BASE_URL):
         from six.moves.urllib.parse import urlencode
         from six.moves.urllib.parse import urlsplit
         from six.moves.urllib.parse import urlunsplit
-        # mimic the build_api_url interface, but avoid unused param and
-        # missed coverage errors
-        upload = not upload  # pragma NO COVER
+        # Mimic the build_api_url interface.
         qs = urlencode(query_params or {})
         scheme, netloc, _, _, _ = urlsplit(api_base_url)
         return urlunsplit((scheme, netloc, path, qs, ''))

gcloud/storage/test_connection.py

@@ -78,17 +78,6 @@ def test_build_api_url_w_extra_query_params(self):
         parms = dict(parse_qsl(qs))
         self.assertEqual(parms['bar'], 'baz')
 
-    def test_build_api_url_w_upload(self):
-        conn = self._makeOne()
-        URI = '/'.join([
-            conn.API_BASE_URL,
-            'upload',
-            'storage',
-            conn.API_VERSION,
-            'foo',
-        ])
-        self.assertEqual(conn.build_api_url('/foo', upload=True), URI)
-
     def test__make_request_no_data_no_content_type_no_headers(self):
         conn = self._makeOne()
         URI = 'http://example.com/test'