Merge pull request #237 from songfei9315/master

fix home

Author: longbai

examples/download.py

@@ -8,6 +8,8 @@
 secret_key = '...'
 
 q = Auth(access_key, secret_key)
+bucket_domain = "..."
+key = "..."
 
 #有两种方式构造base_url的形式
 base_url = 'http://%s/%s' % (bucket_domain, key)

examples/upload_callback.py

@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
 
-from qiniu import Auth, put_file, etag,
+from qiniu import Auth, put_file, etag
 import qiniu.config
 
 access_key = '...'
-secret_key = ...'
+secret_key = '...'
 
 q = Auth(access_key, secret_key)
 
 bucket_name = 'Bucket_Name'
 
-key = 'my-python-logo.png';
+key = 'my-python-logo.png'
 
 #上传文件到七牛后， 七牛将文件名和文件大小回调给业务服务器。
 policy={
@@ -27,3 +27,4 @@
 print(info)
 assert ret['key'] == key
 assert ret['hash'] == etag(localfile)
+

examples/upload_pfops.py

@@ -3,8 +3,8 @@
 from qiniu import Auth, put_file, etag, urlsafe_base64_encode
 import qiniu.config
 
-# access_key = '...'
-# secret_key = '...'
+access_key = '...'
+secret_key = '...'
 
 # 初始化Auth状态
 q = Auth(access_key, secret_key)

qiniu/main.py

@@ -30,5 +30,6 @@ def main():
         else:
             print(' '.join(r))
 
+
 if __name__ == '__main__':
     main()

qiniu/zone.py

@@ -3,7 +3,7 @@
 import os
 import time
 import requests
-
+import tempfile
 from qiniu import compat
 from qiniu import utils
 
@@ -19,11 +19,12 @@ class Zone(object):
         up_host: 首选上传地址
         up_host_backup: 备用上传地址
     """
-    def __init__(self, up_host=None, up_host_backup=None, io_host=None, host_cache={}, scheme="http"):
+    def __init__(self, up_host=None, up_host_backup=None, io_host=None, host_cache={}, scheme="http", home_dir=tempfile.gettempdir()):
         """初始化Zone类"""
         self.up_host, self.up_host_backup, self.io_host = up_host, up_host_backup, io_host
         self.host_cache = host_cache
         self.scheme = scheme
+        self.home_dir = home_dir
 
     def get_up_host_by_token(self, up_token):
         ak, bucket = self.unmarshal_up_token(up_token)
@@ -113,16 +114,15 @@ def host_cache_from_file(self):
         f.close()
         return
 
+    def host_cache_file_path(self):
+        return os.path.join(self.home_dir, ".qiniu_pythonsdk_hostscache.json")
+
     def host_cache_to_file(self):
         path = self.host_cache_file_path()
         with open(path, 'w') as f:
             compat.json.dump(self.host_cache, f)
         f.close()
 
-    def host_cache_file_path(self):
-        home = os.getenv("HOME")
-        return home + "/.qiniu_pythonsdk_hostscache.json"
-
     def bucket_hosts(self, ak, bucket):
         url = "{0}/v1/query?ak={1}&bucket={2}".format(UC_HOST, ak, bucket)
         ret = requests.get(url)

test_qiniu.py

@@ -355,7 +355,7 @@ def test_hasRead_WithoutSeek_retry2(self):
         key = 'withReadAndWithoutSeek_retry2'
         data = urlopen("http://www.qiniu.com")
         set_default(default_zone=Zone('http://a', 'http://upload.qiniu.com'))
-        token = self.q.upload_token(bucket_name)
+        token = self.q.upload_token(bucket_name, key)
         ret, info = put_data(token, key, data)
         print(info)
         assert ret is not None