Accomodate new back-end restriction on retention period. (#6388)

Closes #6368.
googleapis · Nov 5, 2018 · 062235c · 062235c
1 parent c2dd946
commit 062235c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
@@ -1352,8 +1352,9 @@ def retention_period(self, value):
         """
         policy = self._properties.setdefault('retentionPolicy', {})
         if value is not None:
-            value = str(value)
-        policy['retentionPeriod'] = value
+            policy['retentionPeriod'] = str(value)
+        else:
+            policy = None
         self._patch_property('retentionPolicy', policy)
 
     @property

diff --git a/storage/tests/unit/test_bucket.py b/storage/tests/unit/test_bucket.py
@@ -1597,13 +1597,14 @@ def test_retention_period_getter(self):
     def test_retention_period_setter_w_none(self):
         period = 86400 * 100  # 100 days
         bucket = self._make_one()
-        policy = bucket._properties['retentionPolicy'] = {}
-        policy['retentionPeriod'] = period
+        bucket._properties['retentionPolicy'] = {
+            'retentionPeriod': period,
+        }
 
         bucket.retention_period = None
 
         self.assertIsNone(
-            bucket._properties['retentionPolicy']['retentionPeriod'])
+            bucket._properties['retentionPolicy'])
 
     def test_retention_period_setter_w_int(self):
         period = 86400 * 100  # 100 days