symlink

oss2/api.py

@@ -770,7 +770,7 @@ def list_parts(self, key, upload_id,
                                         'max-parts': str(max_parts)})
         return self._parse_result(resp, xml_utils.parse_list_parts, ListPartsResult)
 
-    def put_object_symlink(self, target_key, symlink_key, headers=None):
+    def put_symlink(self, target_key, symlink_key, headers=None):
         """创建Symlink。
 
         :param str target_key: 目标文件，目标文件不能为符号连接
@@ -783,7 +783,7 @@ def put_object_symlink(self, target_key, symlink_key, headers=None):
         resp = self.__do_object('PUT', symlink_key, headers=headers, params={Bucket.SYMLINK: ''})
         return RequestResult(resp)
 
-    def get_object_symlink(self, symlink_key):
+    def get_symlink(self, symlink_key):
         """获取符号连接文件的目标文件。
 
         :param str symlink_key: 符号连接类文件

tests/test_chinese.py

@@ -53,15 +53,15 @@ def test_local_file(self):
 
         os.remove(u'中文本地文件名.txt')
 
-    def test_get_object_symlink(self):
+    def test_get_symlink(self):
         key = '中文!@#$%^&*()-=文件\x0C-1.txt'
         symlink = u'中文!@#$%^&*()-=文件\x0C-2.txt'
         content = '中文内容'
 
         self.bucket.put_object(key, content)
-        self.bucket.put_object_symlink(key, symlink)
+        self.bucket.put_symlink(key, symlink)
 
-        result = self.bucket.get_object_symlink(symlink)
+        result = self.bucket.get_symlink(symlink)
         self.assertEqual(result.target_key, key)
 
 

tests/test_mock_object.py

@@ -628,7 +628,7 @@ def test_get_acl(self, do_request):
             self.assertEqual(result.acl, expected)
 
     @patch('oss2.Session.do_request')
-    def test_put_object_symlink(self, do_request):
+    def test_put_symlink(self, do_request):
         request_text = '''PUT /sjbhlsgsbecvlpbf?symlink= HTTP/1.1
 Host: ming-oss-share.oss-cn-hangzhou.aliyuncs.com
 Accept-Encoding: identity
@@ -655,14 +655,14 @@ def test_put_object_symlink(self, do_request):
         req_info = unittests.common.mock_response(do_request, response_text)
 
         headers = {'x-oss-meta-key1': 'value1', 'x-oss-meta-key2': 'value2'}
-        result = unittests.common.bucket().put_object_symlink('bcvzkwznomy', 'sjbhlsgsbecvlpbf', headers)
+        result = unittests.common.bucket().put_symlink('bcvzkwznomy', 'sjbhlsgsbecvlpbf', headers)
 
         self.assertRequest(req_info, request_text)
         self.assertEqual(result.request_id, '566B6C0D8CDE4E975D730BEF')
         self.assertEqual(result.status, 200)
 
     @patch('oss2.Session.do_request')
-    def test_get_object_symlink(self, do_request):
+    def test_get_symlink(self, do_request):
         request_text = '''GET /sjbhlsgsbecvlpbf?symlink= HTTP/1.1
 Host: ming-oss-share.oss-cn-hangzhou.aliyuncs.com
 Accept-Encoding: identity
@@ -685,7 +685,7 @@ def test_get_object_symlink(self, do_request):
 
         req_info = unittests.common.mock_response(do_request, response_text)
 
-        result = unittests.common.bucket().get_object_symlink('sjbhlsgsbecvlpbf')
+        result = unittests.common.bucket().get_symlink('sjbhlsgsbecvlpbf')
 
         self.assertRequest(req_info, request_text)
         self.assertEqual(result.request_id, '566B6C0D8CDE4E975D730BEF')

tests/test_object.py

@@ -518,15 +518,15 @@ def test_invalid_crc(self):
         else:
             self.assertTrue(False)
 
-    def test_put_object_symlink(self):
+    def test_put_symlink(self):
         key  = self.random_key()
         symlink = self.random_key()
         content = 'hello'
 
         self.bucket.put_object(key, content)
 
         # put symlink normal
-        self.bucket.put_object_symlink(key, symlink)
+        self.bucket.put_symlink(key, symlink)
 
         head_result = self.bucket.head_object(symlink)
         self.assertEqual(head_result.content_length, len(content))
@@ -535,15 +535,15 @@ def test_put_object_symlink(self):
         self.bucket.put_object(key, content)
 
         # put symlink with meta
-        self.bucket.put_object_symlink(key, symlink, headers={'x-oss-meta-key1': 'value1',
+        self.bucket.put_symlink(key, symlink, headers={'x-oss-meta-key1': 'value1',
                                                               'X-Oss-Meta-Key2': 'value2'})
         head_result = self.bucket.head_object(symlink)
         self.assertEqual(head_result.content_length, len(content))
         self.assertEqual(head_result.etag, '5D41402ABC4B2A76B9719D911017C592')
         self.assertEqual(head_result.headers['x-oss-meta-key1'], 'value1')
         self.assertEqual(head_result.headers['x-oss-meta-key2'], 'value2')
 
-    def test_get_object_symlink(self):
+    def test_get_symlink(self):
         key  = self.random_key()
         symlink = self.random_key()
         content = 'hello'
@@ -552,16 +552,16 @@ def test_get_object_symlink(self):
         auth = oss2.Auth(OSS_ID, OSS_SECRET)
         bucket = oss2.Bucket(auth, OSS_ENDPOINT, random_string(63).lower())
 
-        self.assertRaises(NoSuchBucket, bucket.get_object_symlink, symlink)
+        self.assertRaises(NoSuchBucket, bucket.get_symlink, symlink)
 
         # object no exist
-        self.assertRaises(NoSuchKey, self.bucket.get_object_symlink, symlink)
+        self.assertRaises(NoSuchKey, self.bucket.get_symlink, symlink)
 
         self.bucket.put_object(key, content)
-        self.bucket.put_object_symlink(key, symlink)
+        self.bucket.put_symlink(key, symlink)
 
         # get symlink normal
-        result = self.bucket.get_object_symlink(symlink)
+        result = self.bucket.get_symlink(symlink)
         self.assertEqual(result.target_key, key)
 
 if __name__ == '__main__':