Fix googleapis#65 - Added force parameter to delete non empty buckets.

gcloud/storage/bucket.py

@@ -130,7 +130,7 @@ def new_key(self, key):
 
     raise TypeError('Invalid key: %s' % key)
 
-  def delete(self):
+  def delete(self, force=False):
     """Delete this bucket.
 
     The bucket **must** be empty in order to delete it.
@@ -144,7 +144,7 @@ def delete(self):
 
     # TODO: Make sure the proper exceptions are raised.
 
-    return self.connection.delete_bucket(self.name)
+    return self.connection.delete_bucket(self.name, force)
 
   def delete_key(self, key):
     # TODO: Should we accept a 'silent' param here to not raise an exception?

gcloud/storage/connection.py

@@ -340,7 +340,7 @@ def create_bucket(self, bucket, *args, **kwargs):
                                 data={'name': bucket.name})
     return Bucket.from_dict(response, connection=self)
 
-  def delete_bucket(self, bucket, *args, **kwargs):
+  def delete_bucket(self, bucket, force=False, *args, **kwargs):
     """Delete a bucket.
 
     You can use this method to delete a bucket by name,
@@ -375,6 +375,11 @@ def delete_bucket(self, bucket, *args, **kwargs):
     """
 
     bucket = self.new_bucket(bucket)
+
+    if force:
+      for key in bucket:
+        key.delete()
+
     response = self.api_request(method='DELETE', path=bucket.path)
     return True