https://github.com/QUANTAXIS/QUANTAXIS/issues/819

update for #819
yutiansut · Sep 25, 2018 · d44e01b · d44e01b
2 parents 7ff1516 + a143b2c
commit d44e01b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/QUANTAXIS/QAFetch/QATdx.py b/QUANTAXIS/QAFetch/QATdx.py
@@ -387,7 +387,7 @@ def QA_fetch_get_stock_realtime(code=['000001', '000002'], ip=None, port=None):
     api = TdxHq_API()
     __data = pd.DataFrame()
     with api.connect(ip, port):
-        code = [code] if type(code) is str else code
+        code = [code] if isinstance(code, str) else code
         for id_ in range(int(len(code) / 80) + 1):
             __data = __data.append(api.to_df(api.get_security_quotes(
                 [(_select_market_code(x), x) for x in code[80 * id_:80 * (id_ + 1)]])))
@@ -404,7 +404,7 @@ def QA_fetch_depth_market_data(code=['000001', '000002'], ip=None, port=None):
     api = TdxHq_API()
     __data = pd.DataFrame()
     with api.connect(ip, port):
-        code = [code] if type(code) is str else code
+        code = [code] if isinstance(code, str) else code
         for id_ in range(int(len(code) / 80) + 1):
             __data = __data.append(api.to_df(api.get_security_quotes(
                 [(_select_market_code(x), x) for x in code[80 * id_:80 * (id_ + 1)]])))
@@ -1334,7 +1334,7 @@ def QA_fetch_get_future_min(code, start, end, frequence='1min', ip=None, port=No
         # print(data.datetime)
         data = data\
             .assign(tradetime=pd.to_datetime(data['datetime']), code=str(code))\
-            .assign(datetime=pd.to_datetime(data['datetime'].apply(QA_util_future_to_realdatetime,1)))\
+            .assign(datetime=pd.to_datetime(data['datetime'].apply(QA_util_future_to_realdatetime, 1)))\
             .drop(['year', 'month', 'day', 'hour', 'minute'], axis=1, inplace=False)\
             .assign(date=data['datetime'].apply(lambda x: str(x)[0:10]))\
             .assign(date_stamp=data['datetime'].apply(lambda x: QA_util_date_stamp(x)))\

diff --git a/QUANTAXIS/QAFetch/QATdx_adv.py b/QUANTAXIS/QAFetch/QATdx_adv.py
@@ -161,7 +161,7 @@ def _singal_job(self, context, id_, time_out=0.5):
     def get_realtime(self, code):
         context = pd.DataFrame()
 
-        code = [code] if type(code) is str else code
+        code = [code] if isinstance(code, str) is str else code
         try:
             for id_ in range(int(len(code) / 80) + 1):
                 context = self._singal_job(context, id_)
@@ -176,7 +176,7 @@ def get_realtime(self, code):
             return None
 
     def get_realtime_concurrent(self, code):
-        code = [code] if type(code) is str else code
+        code = [code] if isinstance(code, str) is str else code
 
         try:
             data = {self.get_security_quotes([(self.get_market(
@@ -209,7 +209,7 @@ def _get_security_bars(self, context, code, _type, lens):
             return self._get_security_bars(context, code, _type, lens)
 
     def get_security_bar(self, code, _type, lens):
-        code = [code] if type(code) is str else code
+        code = [code] if isinstance(code, str) is str else code
         context = []
         try:
             for item in code:

diff --git a/QUANTAXIS/QAWeb/QA_Web.py b/QUANTAXIS/QAWeb/QA_Web.py
@@ -30,9 +30,10 @@
                                               SimulateSocketHandler, MonitorSocketHandler)
 from QUANTAXIS.QAWeb.userhandles import SigninHandler, SignupHandler, PersonBlockHandler
 from QUANTAXIS.QAWeb.basehandles import QABaseHandler
-from QUANTAXIS.QAWeb.arphandles import AccountHandler,RiskHandler,MemberHandler
+from QUANTAXIS.QAWeb.arphandles import AccountHandler, RiskHandler, MemberHandler
 from QUANTAXIS.QAWeb.strategyhandlers import StrategyHandler
 
+
 class INDEX(QABaseHandler):
     def get(self):
         self.render('.{}{}'.format(os.sep, "index.html"))
@@ -48,15 +49,15 @@ def main():
             (r"/marketdata/stock/price", StockPriceHandler),
             (r"/marketdata/stock/code", StockCodeHandler),
             (r"/user/signin", SigninHandler),
-            (r"/user/signup", SignupHandler),
+            (r"/user/signup", SignupHandler),   
             (r"/user/blocksetting", PersonBlockHandler),
-            (r"/strategy/content",StrategyHandler),
+            (r"/strategy/content", StrategyHandler),
             (r"/realtime", RealtimeSocketHandler),
             (r"/simulate", SimulateSocketHandler),
             (r"/monitor", MonitorSocketHandler),
             (r"/accounts", AccountHandler),
-            (r"/accounts/all",MemberHandler),
-            (r"/risk",RiskHandler)
+            (r"/accounts/all", MemberHandler),
+            (r"/risk", RiskHandler)
         ],
         debug=True
     )