Merge branch 'dev' into 'master'

Dev

See merge request server/openapi/openapi-python-sdk!148

Author: tigersk

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.6 (2022-12-14)
+### Fix
+- 修复 Windows 系统编码为gbk时安装报编码错误的问题
+
 ## 2.2.5 (2022-12-12)
 ### New
 - `TradeClient.get_contract` 返回的合约对象 `tigeropen.trade.domain.contract.Contract` 新增属性: `is_etf`, `etf_leverage`

setup.py

@@ -10,7 +10,7 @@
 
 with open(path.join(path.abspath(path.dirname(__file__)), 'requirements.txt')) as f:
     install_requires = f.read()
-with open(path.join(path.abspath(path.dirname(__file__)), 'README.md')) as f:
+with open(path.join(path.abspath(path.dirname(__file__)), 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
 
 setup(

tigeropen/__init__.py

@@ -4,4 +4,4 @@
 
 @author: gaoan
 """
-__VERSION__ = '2.2.5'
+__VERSION__ = '2.2.6'

tigeropen/tiger_open_client.py

@@ -95,7 +95,7 @@ def __remove_common_params(self, params):
     """
     内部方法，通过请求request对象构造请求查询字符串和业务参数
     """
-    def __prepare_request(self, request, url=None):
+    def __prepare_request(self, request, url=''):
         THREAD_LOCAL.logger = self.__logger
         params = request.get_params()
         params[P_TIMESTAMP] = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")