Merge pull request #39 from tigerfintech/feature_remove_py2

remove python2 compatible

Author: hotea

requirements.txt

@@ -1,11 +1,9 @@
-six==1.13.0
-simplejson==3.17.0
+simplejson==3.17.3
 delorean==1.0.0
-pandas==0.25.3
-python-dateutil==2.8.1
-pytz==2019.3
-pyasn1==0.4.2
-rsa==4.0
-stomp.py==4.1.22
-enum34==1.1.6
+pandas==1.3.0
+python-dateutil==2.8.2
+pytz==2021.1
+pyasn1==0.4.8
+rsa==4.7.2
+stomp.py==4.1.24
 getmac==0.8.2

setup.py

@@ -5,14 +5,15 @@
 @author: gaoan
 """
 from os import path
+
 from setuptools import find_packages, setup
 
 with open(path.join(path.abspath(path.dirname(__file__)), 'requirements.txt')) as f:
     install_requires = f.read()
 
 setup(
     name='tigeropen',
-    version='1.4.0',
+    version='2.0.0',
     description='TigerBrokers Open API',
     packages=find_packages(exclude=[]),
     author='TigerBrokers',
@@ -26,10 +27,11 @@
         'Programming Language :: Python',
         'Operating System :: Microsoft :: Windows',
         'Operating System :: Unix',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
 )

tigeropen/common/consts/__init__.py

@@ -5,18 +5,11 @@
 @author: gaoan
 """
 import threading
-import platform
 from enum import Enum, unique
-from .quote_keys import QuoteChangeKey, QuoteKeyType
+
 from .fundamental_fields import Valuation, Income, Balance, CashFlow, BalanceSheetRatio, Growth, \
     Leverage, Profitability
-
-python_version = platform.python_version()
-
-if python_version.startswith("3"):
-    PYTHON_VERSION_3 = True
-else:
-    PYTHON_VERSION_3 = False
+from .quote_keys import QuoteChangeKey, QuoteKeyType
 
 OPEN_API_SDK_VERSION = "2.0"
 

tigeropen/common/response.py

@@ -6,7 +6,7 @@
 """
 
 
-class TigerResponse(object):
+class TigerResponse:
     def __init__(self):
         self.code = None
         self.message = None

tigeropen/common/util/signature_utils.py

@@ -13,7 +13,6 @@
 
 import rsa
 
-from tigeropen.common.consts import PYTHON_VERSION_3
 from tigeropen.common.util.string_utils import add_start_end
 
 
@@ -58,8 +57,7 @@ def fill_public_key_marker(public_key):
 
 
 def sign_with_rsa(private_key, sign_content, charset):
-    if PYTHON_VERSION_3:
-        sign_content = sign_content.encode(charset)
+    sign_content = sign_content.encode(charset)
     try:
         private_key = rsa.PrivateKey.load_pkcs1(fill_private_key_marker(private_key), format='PEM')
     except binascii.Error:
@@ -68,9 +66,7 @@ def sign_with_rsa(private_key, sign_content, charset):
 
     signature = rsa.sign(sign_content, private_key, 'SHA-1')
 
-    sign = base64.b64encode(signature)
-    if PYTHON_VERSION_3:
-        sign = str(sign, encoding=charset)
+    sign = str(base64.b64encode(signature), encoding=charset)
     return sign
 
 

tigeropen/common/util/string_utils.py

@@ -6,8 +6,6 @@
 """
 import re
 
-from tigeropen.common.consts import PYTHON_VERSION_3
-
 
 def add_start_end(key, start_marker, end_marker):
     if key.find(start_marker) < 0:
@@ -23,8 +21,3 @@ def camel_to_underline(hunp_str):
     return sub
 
 
-def get_string(value):
-    if PYTHON_VERSION_3:
-        return value
-    else:
-        return value.encode('utf-8')

tigeropen/common/util/web_utils.py

@@ -5,7 +5,8 @@
 @author: gaoan
 """
 import json
-from tigeropen.common.consts import PYTHON_VERSION_3, THREAD_LOCAL
+
+from tigeropen.common.consts import THREAD_LOCAL
 from tigeropen.common.exceptions import RequestException, ResponseException
 
 try:
@@ -28,10 +29,7 @@ def url_encode(params, charset):
         value = v
         if not isinstance(value, str):
             value = json.dumps(value, ensure_ascii=False)
-        if PYTHON_VERSION_3:
-            value = quote_plus(value, encoding=charset)
-        else:
-            value = quote_plus(value)
+        value = quote_plus(value, encoding=charset)
         query_string += ("&" + k + "=" + value)
     query_string = query_string[1:]
     return query_string
@@ -69,7 +67,7 @@ def do_post(url, query_string=None, headers=None, params=None, timeout=15, chars
     result = response.read()
 
     if response.status != 200:
-        if PYTHON_VERSION_3 and charset:
+        if charset:
             result = result.decode(charset)
         raise ResponseException('[' + THREAD_LOCAL.uuid + ']invalid http status ' + str(response.status) +
                                 ',detail body:' + result)

tigeropen/examples/client_config.py

@@ -18,10 +18,10 @@ def get_client_config():
     client_config = TigerOpenClientConfig(sandbox_debug=is_sandbox)
     client_config.private_key = read_private_key('your private key file path')
     client_config.tiger_id = 'your tiger id'
-    client_config.account = 'your account'  # 环球账户.
-    # 只使用一个账户时，不论是环球账户, 标准账户或是模拟账户, 都填在 client_config.account 下, 默认只会使用这里的账户.
+    client_config.account = 'your account'  # 账户. 不论是环球账户, 综合账户或是模拟账户, 都填在此处
     # standard_account 属性和 paper_account 属性只是为多账户时取用方便, 一般可忽略
-    client_config.standard_account = None  # 标准账户
-    client_config.paper_account = None  # 模拟账户
+    client_config.standard_account = None
+    client_config.paper_account = None
+    client_config.secret_key = None  # 机构交易员专有密钥 (机构用户需要填写, 个人开发者无需填写)
     client_config.language = Language.en_US
     return client_config

tigeropen/fundamental/request/model.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-class FinancialDailyParams(object):
+class FinancialDailyParams:
     def __init__(self):
         self._symbols = None
         self._market = None
@@ -82,7 +82,7 @@ def to_openapi_dict(self):
         return params
 
 
-class FinancialReportParams(object):
+class FinancialReportParams:
     def __init__(self):
         self._symbols = None
         self._market = None
@@ -139,7 +139,7 @@ def to_openapi_dict(self):
         return params
 
 
-class CorporateActionParams(object):
+class CorporateActionParams:
     def __init__(self):
         self._symbols = None
         self._market = None
@@ -208,7 +208,7 @@ def to_openapi_dict(self):
         return params
 
 
-class IndustryParams(object):
+class IndustryParams:
     def __init__(self):
         self._industry_level = None
         self._industry_id = None

tigeropen/fundamental/response/financial_daily_response.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 
 import pandas as pd
-import six
 
 from tigeropen.common.response import TigerResponse
-from tigeropen.common.util.string_utils import get_string
 
 COLUMNS = ['symbol', 'field', 'date', 'value']
 
@@ -25,8 +23,6 @@ def parse_response_content(self, response_content):
             for item in self.data:
                 item_values = dict()
                 for key, value in item.items():
-                    if isinstance(value, six.string_types):
-                        value = get_string(value)
                     item_values[key] = value
                 items.append(item_values)
             self.financial_daily = pd.DataFrame(items, columns=COLUMNS)