remove python2 compatible code

Author: tigersk

requirements.txt

@@ -1,4 +1,3 @@
-six==1.16.0
 simplejson==3.17.3
 delorean==1.0.0
 pandas==1.3.0
@@ -7,5 +6,4 @@ pytz==2021.1
 pyasn1==0.4.8
 rsa==4.7.2
 stomp.py==4.1.24
-enum34==1.1.10
 getmac==0.8.2

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/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:
@@ -24,7 +22,5 @@ def camel_to_underline(hunp_str):
 
 
 def get_string(value):
-    if PYTHON_VERSION_3:
-        return value
-    else:
-        return value.encode('utf-8')
+    return value
+

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/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)

tigeropen/fundamental/response/financial_report_response.py

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import pandas as pd
-import six
-from tigeropen.common.util.string_utils import get_string
+
 from tigeropen.common.response import TigerResponse
 
 COLUMNS = ['symbol', 'currency', 'field', 'value', 'period_end_date', 'filing_date']
@@ -25,8 +24,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_report = pd.DataFrame(items).rename(columns=REPORT_FIELD_MAPPINGS)[COLUMNS]

tigeropen/push/push_client.py

@@ -4,22 +4,21 @@
 
 @author: gaoan
 """
-import sys
 import json
+import logging
+import sys
 from collections import defaultdict
 
 import stomp
-import six
-import logging
 from stomp.exception import ConnectFailedException
 
+from tigeropen.common.consts import OrderStatus
 from tigeropen.common.consts.push_destinations import QUOTE, QUOTE_DEPTH, QUOTE_FUTURE, QUOTE_OPTION, TRADE_ASSET, \
     TRADE_ORDER, TRADE_POSITION
-from tigeropen.common.util.signature_utils import sign_with_rsa
-from tigeropen.common.util.order_utils import get_order_status
 from tigeropen.common.consts.push_types import RequestType, ResponseType
 from tigeropen.common.consts.quote_keys import QuoteChangeKey, QuoteKeyType
-from tigeropen.common.consts import OrderStatus
+from tigeropen.common.util.order_utils import get_order_status
+from tigeropen.common.util.signature_utils import sign_with_rsa
 
 HOUR_TRADING_QUOTE_KEYS_MAPPINGS = {'hourTradingLatestPrice': 'latest_price', 'hourTradingPreClose': 'pre_close',
                                     'hourTradingLatestTime': 'latest_time', 'hourTradingVolume': 'volume',
@@ -166,8 +165,7 @@ def on_message(self, headers, body):
                         # 期货行情推送的价格都乘了 10 的 offset 次方变成了整数, 需要除回去变为正常单位的价格
                         if offset:
                             for key, value in data.items():
-                                if (key == 'latestTime' or key == 'hourTradingLatestTime') and \
-                                        isinstance(value, six.string_types):
+                                if key == 'latestTime' or key == 'hourTradingLatestTime':
                                     continue
                                 if key in QUOTE_KEYS_MAPPINGS:
                                     key = QUOTE_KEYS_MAPPINGS.get(key)
@@ -183,8 +181,7 @@ def on_message(self, headers, body):
                                     items.append((key, value))
                         else:
                             for key, value in data.items():
-                                if (key == 'latestTime' or key == 'hourTradingLatestTime') and \
-                                        isinstance(value, six.string_types):
+                                if key == 'latestTime' or key == 'hourTradingLatestTime':
                                     continue
                                 if key in QUOTE_KEYS_MAPPINGS:
                                     key = QUOTE_KEYS_MAPPINGS.get(key)
@@ -305,7 +302,7 @@ def subscribe_quote(self, symbols, quote_key_type=QuoteKeyType.TRADE, focus_keys
         if focus_keys:
             keys = list()
             for key in focus_keys:
-                if isinstance(key, six.string_types):
+                if isinstance(key, str):
                     keys.append(key)
                 else:
                     keys.append(key.value)

tigeropen/quote/quote_client.py

@@ -9,7 +9,6 @@
 import re
 
 import delorean
-import six
 
 from tigeropen.common.consts import Market, Language, QuoteRight, BarPeriod
 from tigeropen.common.consts import THREAD_LOCAL, SecurityType, CorporateActionType, IndustryLevel
@@ -50,8 +49,8 @@
 from tigeropen.quote.response.option_quote_ticks_response import OptionTradeTickResponse
 from tigeropen.quote.response.quote_bar_response import QuoteBarResponse
 from tigeropen.quote.response.quote_brief_response import QuoteBriefResponse
-from tigeropen.quote.response.quote_grab_permission_response import QuoteGrabPermissionResponse
 from tigeropen.quote.response.quote_depth_response import DepthQuoteResponse
+from tigeropen.quote.response.quote_grab_permission_response import QuoteGrabPermissionResponse
 from tigeropen.quote.response.quote_ticks_response import TradeTickResponse
 from tigeropen.quote.response.quote_timeline_response import QuoteTimelineResponse
 from tigeropen.quote.response.stock_briefs_response import StockBriefsResponse
@@ -533,7 +532,7 @@ def get_option_chain(self, symbol, expiry):
         params = MultipleContractParams()
         param = SingleContractParams()
         param.symbol = symbol
-        if isinstance(expiry, six.string_types) and re.match('[0-9]{4}\-[0-9]{2}\-[0-9]{2}', expiry):
+        if isinstance(expiry, str) and re.match('[0-9]{4}-[0-9]{2}-[0-9]{2}', expiry):
             param.expiry = int(delorean.parse(expiry, timezone=eastern, dayfirst=False).datetime.timestamp() * 1000)
         else:
             param.expiry = expiry

tigeropen/quote/response/future_briefs_response.py

@@ -4,10 +4,9 @@
 
 @author: gaoan
 """
-import six
 import pandas as pd
+
 from tigeropen.common.response import TigerResponse
-from tigeropen.common.util.string_utils import get_string
 
 COLUMNS = ['identifier', 'ask_price', 'ask_size', 'bid_price', 'bid_size', 'pre_close', 'latest_price', 'latest_size',
            'latest_time', 'volume', 'open_interest', 'open', 'high', 'low', 'limit_up', 'limit_down']
@@ -35,8 +34,6 @@ def parse_response_content(self, response_content):
                 for key, value in item.items():
                     if value is None:
                         continue
-                    if isinstance(value, six.string_types):
-                        value = get_string(value)
                     tag = BRIEF_FIELD_MAPPINGS[key] if key in BRIEF_FIELD_MAPPINGS else key
                     item_values[tag] = value
                 brief_data.append([item_values.get(tag) for tag in COLUMNS])
@@ -45,8 +42,6 @@ def parse_response_content(self, response_content):
             for key, value in self.data.items():
                 if value is None:
                     continue
-                if isinstance(value, six.string_types):
-                    value = get_string(value)
                 tag = BRIEF_FIELD_MAPPINGS[key] if key in BRIEF_FIELD_MAPPINGS else key
                 item_values[tag] = value
             brief_data.append([item_values.get(tag) for tag in COLUMNS])