sync from qcloudapi sdk

QcloudApi/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.14'
+__version__ = '2.0.15'

QcloudApi/modules/base.py

@@ -49,6 +49,7 @@ def __init__(self, config):
         self.Version = config.get('Version', '')
         self.method = config.get('method', 'GET').upper()
         self.sign_method = config.get('SignatureMethod', 'HmacSHA1')
+        self.requestHost = self.requestHost or config.get("endpoint")
         self.apiRequest = ApiRequest(self.requestHost)
         self.Token = config.get('Token', '')
 

QcloudApi/modules/cdn.py

@@ -39,22 +39,3 @@ def UploadCdnEntity(self, params):
         }
 
         return self.call(action, params, files)
-
-
-def main():
-    config = {
-        'Region': 'gz',
-        'secretId': '你的secretId',
-        'secretKey': '你的secretKey',
-        'method': 'post'
-    }
-    params = {
-        'entityFileName': '/test.txt',
-        'entityFile': '/tmp/test.txt'
-    }
-    service = Cdn(config)
-    print(service.UploadCdnEntity(params))
-
-
-if (__name__ == '__main__'):
-    main()

QcloudApi/qcloudapi.py

@@ -1,6 +1,8 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from QcloudApi.modules import base
+
 
 class QcloudApi(object):
     def __init__(self, module, config):
@@ -141,7 +143,8 @@ def _factory(self, module, config):
             from .modules.dc import Dc
             service = Dc(config)
         else:
-            raise ValueError('module not exists')
+            config.setdefault("endpoint", module + '.api.qcloud.com')
+            service = base.Base(config)
 
         return service
 
@@ -155,7 +158,7 @@ def setRequestMethod(self, method):
         self.config['method'] = method
 
     def setRegion(self, region):
-        self.config['region'] = region
+        self.config['Region'] = region
 
     def setSignatureMethod(self, SignatureMethod):
         self.config['SignatureMethod'] = SignatureMethod
@@ -191,25 +194,3 @@ def call(self, action, params, req_timeout=None, debug=False):
                 return func(params)
 
         return service.call(action, params)
-
-
-def main():
-    module = 'cdn'
-    action = 'UploadCdnEntity'
-    config = {
-        'Region': 'gz',
-        'secretId': '你的secretId',
-        'secretKey': '你的secretKey',
-        'method': 'post'
-    }
-    params = {
-        'entityFileName': '/test_____don.html',
-        'entityFile': 'c:/xampp/htdocs/index.html'
-    }
-    service = QcloudApi(module, config)
-    print(('URL:\n' + service.generateUrl(action, params)))
-    print((service.call(action, params)))
-
-
-if (__name__ == '__main__'):
-    main()