Skip to content

Commit 14f2ee9

Browse files
tswasttswast
authored
Revert "fix: add user-agent on requests (#295)" (#297)
This reverts commit e107a0cac7ca367015a025a6872a8ad28c7ff15c.
1 parent 47c119e commit 14f2ee9

File tree

7 files changed

+60
-74
lines changed

7 files changed

+60
-74
lines changed

‎packages/google-resumable-media/google/resumable_media/_download.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def __init__(self, media_url, stream=None, start=None, end=None, headers=None):
5858
self.end = end
5959
if headers is None:
6060
headers = {}
61-
self._headers = _helpers._base_headers(headers)
61+
self._headers = headers
6262
self._finished = False
6363
self._retry_strategy = common.RetryStrategy()
6464

‎packages/google-resumable-media/google/resumable_media/_helpers.py‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import hashlib
2121
import logging
2222
import random
23-
import pkg_resources
2423
import warnings
2524

2625
from google.resumable_media import common
@@ -46,13 +45,6 @@ def do_nothing():
4645
"""Simple default callback."""
4746

4847

49-
def _base_headers(headers):
50-
version = pkg_resources.get_distribution("google-resumable-media").version
51-
headers["User-Agent"] = "gcloud-python/{}-resumable-media".format(version)
52-
headers["X-Goog-Api-Client"] = "gcloud-python/{}-resumable-media".format(version)
53-
return headers
54-
55-
5648
def header_required(response, name, get_headers, callback=do_nothing):
5749
"""Checks that a specific header is in a headers dictionary.
5850

‎packages/google-resumable-media/google/resumable_media/_upload.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def __init__(self, upload_url, headers=None):
8383
self.upload_url = upload_url
8484
if headers is None:
8585
headers = {}
86-
self._headers = _helpers._base_headers(headers)
86+
self._headers = headers
8787
self._finished = False
8888
self._retry_strategy = common.RetryStrategy()
8989

‎packages/google-resumable-media/tests/unit/requests/test_download.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from google.resumable_media import _helpers
2323
from google.resumable_media.requests import download as download_mod
2424
from google.resumable_media.requests import _request_helpers
25-
from google.resumable_media._helpers import _base_headers
25+
2626

2727
URL_PREFIX = "https://www.googleapis.com/download/storage/v1/b/{BUCKET}/o/"
2828
EXAMPLE_URL = URL_PREFIX + "{OBJECT}?alt=media"
@@ -241,7 +241,7 @@ def test_consume_with_stream_hash_check_fail(self, checksum):
241241

242242
assert stream.getvalue() == b"".join(chunks)
243243
assert download.finished
244-
assert download._headers == _base_headers({})
244+
assert download._headers == {}
245245

246246
error = exc_info.value
247247
assert error.response is transport.request.return_value
@@ -260,7 +260,7 @@ def test_consume_with_stream_hash_check_fail(self, checksum):
260260
"GET",
261261
EXAMPLE_URL,
262262
data=None,
263-
headers=_base_headers({}),
263+
headers={},
264264
stream=True,
265265
timeout=EXPECTED_TIMEOUT,
266266
)
@@ -271,7 +271,7 @@ def test_consume_with_headers(self):
271271
self._consume_helper(end=end, headers=headers)
272272
range_bytes = "bytes={:d}-{:d}".format(0, end)
273273
# Make sure the headers have been modified.
274-
assert headers == _base_headers({"range": range_bytes})
274+
assert headers == {"range": range_bytes}
275275

276276

277277
class TestRawDownload(object):
@@ -494,7 +494,7 @@ def test_consume_with_stream_hash_check_fail(self, checksum):
494494

495495
assert stream.getvalue() == b"".join(chunks)
496496
assert download.finished
497-
assert download._headers == _base_headers({})
497+
assert download._headers == {}
498498

499499
error = exc_info.value
500500
assert error.response is transport.request.return_value
@@ -513,7 +513,7 @@ def test_consume_with_stream_hash_check_fail(self, checksum):
513513
"GET",
514514
EXAMPLE_URL,
515515
data=None,
516-
headers=_base_headers({}),
516+
headers={},
517517
stream=True,
518518
timeout=EXPECTED_TIMEOUT,
519519
)
@@ -524,7 +524,7 @@ def test_consume_with_headers(self):
524524
self._consume_helper(end=end, headers=headers)
525525
range_bytes = "bytes={:d}-{:d}".format(0, end)
526526
# Make sure the headers have been modified.
527-
assert headers == _base_headers({"range": range_bytes})
527+
assert headers == {"range": range_bytes}
528528

529529

530530
class TestChunkedDownload(object):
@@ -589,7 +589,7 @@ def test_consume_next_chunk(self):
589589
ret_val = download.consume_next_chunk(transport)
590590
assert ret_val is transport.request.return_value
591591
range_bytes = "bytes={:d}-{:d}".format(start, start + chunk_size - 1)
592-
download_headers = _base_headers({"range": range_bytes})
592+
download_headers = {"range": range_bytes}
593593
transport.request.assert_called_once_with(
594594
"GET",
595595
EXAMPLE_URL,
@@ -618,7 +618,7 @@ def test_consume_next_chunk_with_custom_timeout(self):
618618
download.consume_next_chunk(transport, timeout=14.7)
619619

620620
range_bytes = "bytes={:d}-{:d}".format(start, start + chunk_size - 1)
621-
download_headers = _base_headers({"range": range_bytes})
621+
download_headers = {"range": range_bytes}
622622
transport.request.assert_called_once_with(
623623
"GET",
624624
EXAMPLE_URL,
@@ -695,7 +695,7 @@ def test_consume_next_chunk(self):
695695
"GET",
696696
EXAMPLE_URL,
697697
data=None,
698-
headers=_base_headers(download_headers),
698+
headers=download_headers,
699699
stream=True,
700700
timeout=EXPECTED_TIMEOUT,
701701
)
@@ -725,7 +725,7 @@ def test_consume_next_chunk_with_custom_timeout(self):
725725
"GET",
726726
EXAMPLE_URL,
727727
data=None,
728-
headers=_base_headers(download_headers),
728+
headers=download_headers,
729729
stream=True,
730730
timeout=14.7,
731731
)

‎packages/google-resumable-media/tests/unit/requests/test_upload.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import mock
2020

2121
import google.resumable_media.requests.upload as upload_mod
22-
from google.resumable_media._helpers import _base_headers
2322

2423

2524
URL_PREFIX = "https://www.googleapis.com/upload/storage/v1/b/{BUCKET}/o"
@@ -49,7 +48,7 @@ def test_transmit(self):
4948
"POST",
5049
SIMPLE_URL,
5150
data=data,
52-
headers=_base_headers(upload_headers),
51+
headers=upload_headers,
5352
timeout=EXPECTED_TIMEOUT,
5453
)
5554
assert upload.finished
@@ -68,7 +67,7 @@ def test_transmit_w_custom_timeout(self):
6867
"POST",
6968
SIMPLE_URL,
7069
data=data,
71-
headers=_base_headers(expected_headers),
70+
headers=expected_headers,
7271
timeout=12.6,
7372
)
7473

@@ -104,7 +103,7 @@ def test_transmit(self, mock_get_boundary):
104103
"POST",
105104
MULTIPART_URL,
106105
data=expected_payload,
107-
headers=_base_headers(upload_headers),
106+
headers=upload_headers,
108107
timeout=EXPECTED_TIMEOUT,
109108
)
110109
assert upload.finished
@@ -142,7 +141,7 @@ def test_transmit_w_custom_timeout(self, mock_get_boundary):
142141
"POST",
143142
MULTIPART_URL,
144143
data=expected_payload,
145-
headers=_base_headers(upload_headers),
144+
headers=upload_headers,
146145
timeout=12.6,
147146
)
148147
assert upload.finished
@@ -188,7 +187,7 @@ def test_initiate(self):
188187
"POST",
189188
RESUMABLE_URL,
190189
data=json_bytes,
191-
headers=_base_headers(expected_headers),
190+
headers=expected_headers,
192191
timeout=EXPECTED_TIMEOUT,
193192
)
194193

@@ -224,7 +223,7 @@ def test_initiate_w_custom_timeout(self):
224223
"POST",
225224
RESUMABLE_URL,
226225
data=json_bytes,
227-
headers=_base_headers(expected_headers),
226+
headers=expected_headers,
228227
timeout=12.6,
229228
)
230229

‎packages/google-resumable-media/tests/unit/test__download.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from google.resumable_media import _download
2222
from google.resumable_media import common
23-
from google.resumable_media._helpers import _base_headers
23+
2424

2525
EXAMPLE_URL = (
2626
"https://www.googleapis.com/download/storage/v1/b/{BUCKET}/o/{OBJECT}?alt=media"
@@ -34,7 +34,7 @@ def test_constructor_defaults(self):
3434
assert download._stream is None
3535
assert download.start is None
3636
assert download.end is None
37-
assert download._headers == _base_headers({})
37+
assert download._headers == {}
3838
assert not download._finished
3939
_check_retry_strategy(download)
4040

@@ -53,7 +53,7 @@ def test_constructor_explicit(self):
5353
assert download._stream is mock.sentinel.stream
5454
assert download.start == start
5555
assert download.end == end
56-
assert download._headers == _base_headers(headers)
56+
assert download._headers is headers
5757
assert not download._finished
5858
_check_retry_strategy(download)
5959

@@ -102,14 +102,14 @@ def test__prepare_request(self):
102102
assert method1 == "GET"
103103
assert url1 == EXAMPLE_URL
104104
assert payload1 is None
105-
assert headers1 == _base_headers({})
105+
assert headers1 == {}
106106

107107
download2 = _download.Download(EXAMPLE_URL, start=53)
108108
method2, url2, payload2, headers2 = download2._prepare_request()
109109
assert method2 == "GET"
110110
assert url2 == EXAMPLE_URL
111111
assert payload2 is None
112-
assert headers2 == _base_headers({"range": "bytes=53-"})
112+
assert headers2 == {"range": "bytes=53-"}
113113

114114
def test__prepare_request_with_headers(self):
115115
headers = {"spoonge": "borb"}
@@ -118,9 +118,8 @@ def test__prepare_request_with_headers(self):
118118
assert method == "GET"
119119
assert url == EXAMPLE_URL
120120
assert payload is None
121-
assert new_headers == _base_headers(
122-
{"range": "bytes=11-111", "spoonge": "borb"}
123-
)
121+
assert new_headers is headers
122+
assert headers == {"range": "bytes=11-111", "spoonge": "borb"}
124123

125124
def test__process_response(self):
126125
download = _download.Download(EXAMPLE_URL)
@@ -172,7 +171,7 @@ def test_constructor_defaults(self):
172171
assert download.chunk_size == chunk_size
173172
assert download.start == 0
174173
assert download.end is None
175-
assert download._headers == _base_headers({})
174+
assert download._headers == {}
176175
assert not download._finished
177176
_check_retry_strategy(download)
178177
assert download._stream is stream
@@ -289,7 +288,7 @@ def test__prepare_request(self):
289288
assert method1 == "GET"
290289
assert url1 == EXAMPLE_URL
291290
assert payload1 is None
292-
assert headers1 == _base_headers({"range": "bytes=0-2047"})
291+
assert headers1 == {"range": "bytes=0-2047"}
293292

294293
download2 = _download.ChunkedDownload(
295294
EXAMPLE_URL, chunk_size, None, start=19991
@@ -299,7 +298,7 @@ def test__prepare_request(self):
299298
assert method2 == "GET"
300299
assert url2 == EXAMPLE_URL
301300
assert payload2 is None
302-
assert headers2 == _base_headers({"range": "bytes=19991-20100"})
301+
assert headers2 == {"range": "bytes=19991-20100"}
303302

304303
def test__prepare_request_with_headers(self):
305304
chunk_size = 2048
@@ -311,8 +310,9 @@ def test__prepare_request_with_headers(self):
311310
assert method == "GET"
312311
assert url == EXAMPLE_URL
313312
assert payload is None
313+
assert new_headers is headers
314314
expected = {"patrizio": "Starf-ish", "range": "bytes=0-2047"}
315-
assert new_headers == _base_headers(expected)
315+
assert headers == expected
316316

317317
def test__make_invalid(self):
318318
download = _download.ChunkedDownload(EXAMPLE_URL, 512, None)

0 commit comments

Comments
 (0)