Skip to content

Commit 3a583a4

Browse files
committed
Remove no-version warning for 'Bucket.generate_signed_url', too.
1 parent ccccaed commit 3a583a4

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

storage/google/cloud/storage/bucket.py

-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
from google.cloud.storage._signing import generate_signed_url_v4
3838
from google.cloud.storage.acl import BucketACL
3939
from google.cloud.storage.acl import DefaultObjectACL
40-
from google.cloud.storage.blob import _SIGNED_URL_V2_DEFAULT_MESSAGE
4140
from google.cloud.storage.blob import Blob
4241
from google.cloud.storage.notification import BucketNotification
4342
from google.cloud.storage.notification import NONE_PAYLOAD_FORMAT
@@ -2056,7 +2055,6 @@ def generate_signed_url(
20562055
"""
20572056
if version is None:
20582057
version = "v2"
2059-
warnings.warn(DeprecationWarning(_SIGNED_URL_V2_DEFAULT_MESSAGE))
20602058
elif version not in ("v2", "v4"):
20612059
raise ValueError("'version' must be either 'v2' or 'v4'")
20622060

storage/tests/unit/test_bucket.py

+9-17
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
import datetime
1616
import unittest
17-
import warnings
1817

1918
import mock
2019

@@ -2623,22 +2622,15 @@ def _generate_signed_url_helper(
26232622
)
26242623

26252624
with mock.patch(to_patch) as signer:
2626-
with warnings.catch_warnings(record=True) as warned:
2627-
signed_uri = bucket.generate_signed_url(
2628-
expiration=expiration,
2629-
api_access_endpoint=api_access_endpoint,
2630-
method=method,
2631-
credentials=credentials,
2632-
headers=headers,
2633-
query_parameters=query_parameters,
2634-
version=version,
2635-
)
2636-
2637-
if version is None:
2638-
self.assertEqual(len(warned), 1)
2639-
self.assertIs(warned[0].category, DeprecationWarning)
2640-
else:
2641-
self.assertEqual(len(warned), 0)
2625+
signed_uri = bucket.generate_signed_url(
2626+
expiration=expiration,
2627+
api_access_endpoint=api_access_endpoint,
2628+
method=method,
2629+
credentials=credentials,
2630+
headers=headers,
2631+
query_parameters=query_parameters,
2632+
version=version,
2633+
)
26422634

26432635
self.assertEqual(signed_uri, signer.return_value)
26442636

0 commit comments

Comments
 (0)