Skip to content

Commit a23b6bd

Browse files
committed
Merge pull request #773 from dhermes/remove-patch-from-config-website
Removing patch() from Bucket.configure_website.
2 parents adc0029 + 7cf10dd commit a23b6bd

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

gcloud/storage/bucket.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,6 @@ def configure_website(self, main_page_suffix=None, not_found_page=None):
712712
},
713713
}
714714
self._patch_properties(data)
715-
return self.patch()
716715

717716
def disable_website(self):
718717
"""Disable the website configuration for this bucket.

gcloud/storage/test_bucket.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,8 @@ def test_configure_website_defaults(self):
885885
'notFoundPage': None}}
886886
connection = _Connection(patched)
887887
bucket = self._makeOne(NAME, connection)
888-
self.assertTrue(bucket.configure_website() is bucket)
888+
bucket.configure_website()
889+
bucket.patch()
889890
self.assertEqual(bucket.properties, patched)
890891
kw = connection._requested
891892
self.assertEqual(len(kw), 1)
@@ -900,7 +901,8 @@ def test_configure_website_explicit(self):
900901
'notFoundPage': '404.html'}}
901902
connection = _Connection(patched)
902903
bucket = self._makeOne(NAME, connection)
903-
self.assertTrue(bucket.configure_website('html', '404.html') is bucket)
904+
bucket.configure_website('html', '404.html')
905+
bucket.patch()
904906
self.assertEqual(bucket.properties, patched)
905907
kw = connection._requested
906908
self.assertEqual(len(kw), 1)
@@ -915,7 +917,8 @@ def test_disable_website(self):
915917
'notFoundPage': None}}
916918
connection = _Connection(patched)
917919
bucket = self._makeOne(NAME, connection)
918-
self.assertTrue(bucket.disable_website() is bucket)
920+
bucket.disable_website()
921+
bucket.patch()
919922
self.assertEqual(bucket.properties, patched)
920923
kw = connection._requested
921924
self.assertEqual(len(kw), 1)

0 commit comments

Comments
 (0)