Merge pull request qiniu#166 from forrest-mao/update_entry

update entry construction

qiniu/services/storage/bucket.py

@@ -156,7 +156,7 @@ def copy(self, bucket, key, bucket_to, key_to):
         to = entry(bucket_to, key_to)
         return self.__rs_do('copy', resource, to)
 
-    def fetch(self, url, bucket, key):
+    def fetch(self, url, bucket, key=None):
         """抓取文件:
         从指定URL抓取资源，并将该资源存储到指定空间中，具体规格参考：
         http://developer.qiniu.com/docs/v6/api/reference/rs/fetch.html

qiniu/utils.py

@@ -151,4 +151,7 @@ def entry(bucket, key):
     Returns:
         符合七牛API规格的数据格式
     """
-    return urlsafe_base64_encode('{0}:{1}'.format(bucket, key))
+    if key is None:
+        return urlsafe_base64_encode('{0}'.format(bucket))
+    else:
+        return urlsafe_base64_encode('{0}:{1}'.format(bucket, key))

test_qiniu.py

@@ -134,6 +134,12 @@ def test_fetch(self):
         assert ret['key'] == 'fetch.html'
         assert ret['hash'] == 'FhwVT7vs6xqs1nu_vEdo_4x4qBMB'
 
+    def test_fetch_without_key(self):
+        ret, info = self.bucket.fetch('http://developer.qiniu.com/docs/v6/sdk/python-sdk.html', bucket_name)
+        print(info)
+        assert ret['key'] == 'FhwVT7vs6xqs1nu_vEdo_4x4qBMB'
+        assert ret['hash'] == 'FhwVT7vs6xqs1nu_vEdo_4x4qBMB'
+
     def test_stat(self):
         ret, info = self.bucket.stat(bucket_name, 'python-sdk.html')
         print(info)