Merge pull request #132 from qiniu/develop

Release 6.1.9

Author: longbai

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## CHANGE LOG
 
+### v6.1.9
+
+2014-11-13 
+- 增加文件列表的delimiter，模拟目录方式
+
 ### v6.1.8
 
 2014-08-05 issue [#126](https://github.com/qiniu/python-sdk/pull/126)

docs/gist/demo.py

@@ -359,7 +359,7 @@ def list_prefix_all():
 # @gist list_all
 
 
-def list_all(bucket, rs=None, prefix=None, limit=None):
+def list_all(bucket_name, rs=None, prefix=None, limit=None):
     if rs is None:
         rs = qiniu.rsf.Client()
     marker = None

qiniu/__init__.py

@@ -7,4 +7,4 @@
 '''
 
 # -*- coding: utf-8 -*-
-__version__ = '6.1.8'
+__version__ = '6.1.9'

qiniu/conf.py

@@ -5,8 +5,8 @@
 
 RS_HOST = "rs.qbox.me"
 RSF_HOST = "rsf.qbox.me"
-UP_HOST = "upload.qiniu.com"
-UP_HOST2 = "up.qbox.me"
+UP_HOST = "up.qiniu.com"
+UP_HOST2 = "upload.qbox.me"
 
 from . import __version__
 import platform

qiniu/rs/rs_token.py

@@ -88,7 +88,7 @@ class GetPolicy(object):
     def __init__(self, expires=3600):
         self.expires = expires
 
-    def make_request(self, base_url, mac=None):
+    def make_request(self, base_url, mac=None, attname=None):
         '''
          *  return private_url
         '''
@@ -100,7 +100,10 @@ def make_request(self, base_url, mac=None):
             base_url += '&'
         else:
             base_url += '?'
-        base_url = '%se=%s' % (base_url, str(deadline))
+        if attname is None:
+            base_url = '%se=%s' % (base_url, str(deadline))
+        else:
+            base_url = '%se=%s&attname=%s' % (base_url, str(deadline), attname)
 
         token = mac.sign(base_url)
         return '%s&token=%s' % (base_url, token)

qiniu/rsf.py

@@ -14,12 +14,13 @@ def __init__(self, mac=None):
             mac = auth.digest.Mac()
         self.conn = auth.digest.Client(host=conf.RSF_HOST, mac=mac)
 
-    def list_prefix(self, bucket, prefix=None, marker=None, limit=None):
+    def list_prefix(self, bucket, prefix=None, marker=None, limit=None, delimiter=None):
         '''前缀查询:
          * bucket => str
          * prefix => str
          * marker => str
          * limit => int
+         * delimiter => str
          * return ret => {'items': items, 'marker': markerOut}, err => str
 
         1. 首次请求 marker = None
@@ -35,6 +36,9 @@ def list_prefix(self, bucket, prefix=None, marker=None, limit=None):
             ops['limit'] = limit
         if prefix is not None:
             ops['prefix'] = prefix
+        if delimiter is not None:
+            ops['delimiter'] = delimiter
+
         url = '%s?%s' % ('/list', urllib.urlencode(ops))
         ret, err, code = self.conn.call_with(
             url, body=None, content_type='application/x-www-form-urlencoded')