get_today_all #301

waditu · Mar 13, 2017 · 42fa8f9 · 42fa8f9
1 parent 7234ea9
commit 42fa8f9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/tushare/__init__.py b/tushare/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.6.9'
+__version__ = '0.7.0'
 __author__ = 'Jimmy Liu'
 """
 for trading data

diff --git a/tushare/stock/cons.py b/tushare/stock/cons.py
@@ -76,7 +76,8 @@
 DAY_PRICE_URL = '%sapi.finance.%s/%s/?code=%s&type=last'
 LIVE_DATA_URL = '%shq.%s/rn=%s&list=%s'
 DAY_PRICE_MIN_URL = '%sapi.finance.%s/akmin?scode=%s&type=%s'
-SINA_DAY_PRICE_URL = '%s%s/quotes_service/api/%s/Market_Center.getHQNodeData?num=80&sort=code&asc=0&node=hs_a&symbol=&_s_r_a=page&page=%s'
+# SINA_DAY_PRICE_URL = '%s%s/quotes_service/api/%s/Market_Center.getHQNodeData?num=80&sort=code&asc=0&node=hs_a&symbol=&_s_r_a=page&page=%s'
+SINA_DAY_PRICE_URL = '%s%s/quotes_service/api/%s/Market_Center.getHQNodeData?num=10000&node=hs_a'
 REPORT_URL = '%s%s/q/go.php/vFinanceAnalyze/kind/mainindex/%s?s_i=&s_a=&s_c=&reportdate=%s&quarter=%s&p=%s&num=%s'
 FORECAST_URL = '%s%s/q/go.php/vFinanceAnalyze/kind/performance/%s?s_i=&s_a=&s_c=&s_type=&reportdate=%s&quarter=%s&p=%s&num=%s'
 PROFIT_URL = '%s%s/q/go.php/vFinanceAnalyze/kind/profit/%s?s_i=&s_a=&s_c=&reportdate=%s&quarter=%s&p=%s&num=%s'

diff --git a/tushare/stock/trading.py b/tushare/stock/trading.py
@@ -106,9 +106,9 @@ def _parsing_dayprice_json(pageNum=1):
      -------
         DataFrame 当日所有股票交易数据(DataFrame)
     """
-    ct._write_console()
+#     ct._write_console()
     request = Request(ct.SINA_DAY_PRICE_URL%(ct.P_TYPE['http'], ct.DOMAINS['vsf'],
-                                 ct.PAGES['jv'], pageNum))
+                                 ct.PAGES['jv']))
     text = urlopen(request, timeout=10).read()
     if text == 'null':
         return None
@@ -290,12 +290,12 @@ def get_today_all():
       DataFrame
            属性：代码，名称，涨跌幅，现价，开盘价，最高价，最低价，最日收盘价，成交量，换手率，成交额，市盈率，市净率，总市值，流通市值
     """
-    ct._write_head()
+#     ct._write_head()
     df = _parsing_dayprice_json(1)
-    if df is not None:
-        for i in range(2, ct.PAGE_NUM[0]):
-            newdf = _parsing_dayprice_json(i)
-            df = df.append(newdf, ignore_index=True)
+#     if df is not None:
+#         for i in range(2, ct.PAGE_NUM[0]):
+#             newdf = _parsing_dayprice_json(i)
+#             df = df.append(newdf, ignore_index=True)
     return df
 
 
@@ -750,3 +750,4 @@ def _code_to_symbol(code):
         else:
             return 'sh%s'%code if code[:1] in ['5', '6', '9'] else 'sz%s'%code
 
+