support deleting a specific blob generation

sdigit · sdigit · commit 2790a3689151 · 2018-08-09T15:35:00.000-05:00
diff --git a/storage/google/cloud/storage/blob.py b/storage/google/cloud/storage/blob.py
@@ -388,7 +388,7 @@ def exists(self, client=None):
         except NotFound:
             return False
 
-    def delete(self, client=None):
+    def delete(self, client=None, generation=None):
         """Deletes a blob from Cloud Storage.
 
         If :attr:`user_project` is set on the bucket, bills the API request
@@ -405,7 +405,7 @@ def delete(self, client=None):
                  (propagated from
                  :meth:`google.cloud.storage.bucket.Bucket.delete_blob`).
         """
-        return self.bucket.delete_blob(self.name, client=client)
+        return self.bucket.delete_blob(self.name, client=client, generation=generation)
 
     def _get_transport(self, client):
         """Return the client's transport.
diff --git a/storage/google/cloud/storage/bucket.py b/storage/google/cloud/storage/bucket.py
@@ -575,7 +575,7 @@ def delete(self, force=False, client=None):
             query_params=query_params,
             _target_object=None)
 
-    def delete_blob(self, blob_name, client=None):
+    def delete_blob(self, blob_name, client=None, generation=None):
         """Deletes a blob from the current bucket.
 
         If the blob isn't found (backend 404), raises a
@@ -597,6 +597,11 @@ def delete_blob(self, blob_name, client=None):
         :param client: Optional. The client to use.  If not passed, falls back
                        to the ``client`` stored on the current bucket.
 
+        :type generation: :class:`~google.cloud.storage.client.Client` or
+                          ``NoneType``
+        :param generation: Optional. The generation of the blob to delete. If
+                           not passed, deletes the current version.
+
         :raises: :class:`google.cloud.exceptions.NotFound` (to suppress
                  the exception, call ``delete_blobs``, passing a no-op
                  ``on_error`` callback, e.g.:
@@ -616,11 +621,18 @@ def delete_blob(self, blob_name, client=None):
         # We intentionally pass `_target_object=None` since a DELETE
         # request has no response value (whether in a standard request or
         # in a batch request).
-        client._connection.api_request(
-            method='DELETE',
-            path=blob_path,
-            query_params=query_params,
-            _target_object=None)
+        if not generation:
+            client._connection.api_request(
+                method='DELETE',
+                path=blob_path,
+                query_params=query_params,
+                _target_object=None)
+        else:
+            client._connection.api_request(
+                method='DELETE',
+                path=blob_path + '?generation={}'.format(generation),
+                query_params=query_params,
+                _target_object=None)
 
     def delete_blobs(self, blobs, on_error=None, client=None):
         """Deletes a list of blobs from the current bucket.
