|
80 | 80 | _MAX_MULTIPART_SIZE = 5 * 1024 * 1024 |
81 | 81 | _DEFAULT_NUM_RETRIES = 6 |
82 | 82 | _API_ACCESS_ENDPOINT = "https://bigquery.googleapis.com" |
83 | | -_BASE_UPLOAD_TEMPLATE = "{host}/upload/bigquery/v2/projects/{project}/jobs?uploadType="; |
| 83 | +_BASE_UPLOAD_TEMPLATE = "{host}/upload/bigquery/v2/projects/{project}/jobs?uploadType=" |
84 | 84 | _MULTIPART_URL_TEMPLATE = _BASE_UPLOAD_TEMPLATE + "multipart" |
85 | 85 | _RESUMABLE_URL_TEMPLATE = _BASE_UPLOAD_TEMPLATE + "resumable" |
86 | 86 | _GENERIC_CONTENT_TYPE = "*/*" |
@@ -2546,11 +2546,12 @@ def _initiate_resumable_upload( |
2546 | 2546 |
|
2547 | 2547 | if project is None: |
2548 | 2548 | project = self.project |
2549 | | - hostname = _API_ACCESS_ENDPOINT if not hasattr(self._connection, 'get_api_base_url_for_mtls') else self._connection.get_api_base_url_for_mtls() |
2550 | | - upload_url = _RESUMABLE_URL_TEMPLATE.format( |
2551 | | - host=hostname, |
2552 | | - project=project |
| 2549 | + hostname = ( |
| 2550 | + _API_ACCESS_ENDPOINT |
| 2551 | + if not hasattr(self._connection, "get_api_base_url_for_mtls") |
| 2552 | + else self._connection.get_api_base_url_for_mtls() |
2553 | 2553 | ) |
| 2554 | + upload_url = _RESUMABLE_URL_TEMPLATE.format(host=hostname, project=project) |
2554 | 2555 |
|
2555 | 2556 | # TODO: modify ResumableUpload to take a retry.Retry object |
2556 | 2557 | # that it can use for the initial RPC. |
@@ -2619,11 +2620,12 @@ def _do_multipart_upload( |
2619 | 2620 | if project is None: |
2620 | 2621 | project = self.project |
2621 | 2622 |
|
2622 | | - hostname = _API_ACCESS_ENDPOINT if not hasattr(self._connection, 'get_api_base_url_for_mtls') else self._connection.get_api_base_url_for_mtls() |
2623 | | - upload_url = _MULTIPART_URL_TEMPLATE.format( |
2624 | | - host=hostname, |
2625 | | - project=project |
| 2623 | + hostname = ( |
| 2624 | + _API_ACCESS_ENDPOINT |
| 2625 | + if not hasattr(self._connection, "get_api_base_url_for_mtls") |
| 2626 | + else self._connection.get_api_base_url_for_mtls() |
2626 | 2627 | ) |
| 2628 | + upload_url = _MULTIPART_URL_TEMPLATE.format(host=hostname, project=project) |
2627 | 2629 | upload = MultipartUpload(upload_url, headers=headers) |
2628 | 2630 |
|
2629 | 2631 | if num_retries is not None: |
|
0 commit comments