Ensure that Key.rename actually deletes old key as documents.

Incorporate feedback from @dhermes.

Author: tseaver

gcloud/storage/key.py

@@ -146,7 +146,9 @@ def rename(self, new_name):
         :rtype: :class:`Key`
         :returns: The newly-copied key.
         """
-        return self.bucket.copy_key(self, self.bucket, new_name)
+        new_key = self.bucket.copy_key(self, self.bucket, new_name)
+        self.bucket.delete_key(self)
+        return new_key
 
     def delete(self):
         """Deletes a key from Cloud Storage.

gcloud/storage/test_key.py

@@ -104,12 +104,10 @@ def test_rename(self):
         bucket._keys[KEY] = 1
         orig_key_path = key.path
         new_key = key.rename(NEW_NAME)
-        expected = [
-            ['POST', orig_key_path + '/copyTo/b/bucket/o/%s' % NEW_NAME, None],
-            ['DELETE', orig_key_path, None]]
         self.assertEqual(key.name, KEY)
         self.assertEqual(new_key.name, NEW_NAME)
         self.assertFalse(KEY in bucket._keys)
+        self.assertTrue(KEY in bucket._deleted)
         self.assertTrue(NEW_NAME in bucket._keys)
 
     def test_delete(self):
@@ -607,13 +605,15 @@ class _Bucket(object):
     def __init__(self, connection):
         self.connection = connection
         self._keys = {}
+        self._deleted = []
 
     def get_key(self, key):
         return self._keys.get(key)  # XXX s.b. 'key.name'?
 
     def copy_key(self, key, destination_bucket, new_name):
-        destination_bucket._keys[new_name] = self._keys.pop(key.name)
+        destination_bucket._keys[new_name] = self._keys[key.name]
         return key.from_dict({'name': new_name}, bucket=destination_bucket)
 
     def delete_key(self, key):
         del self._keys[key.name]  # XXX s.b. 'key'?
+        self._deleted.append(key.name)