tushare 1.4.19__py3-none-any.whl → 1.4.21__py3-none-any.whl

tushare/__init__.py

@@ -2,7 +2,7 @@
 import codecs
 import os
 
-__version__ = '1.4.19'
+__version__ = '1.4.21'
 __author__ = 'Jimmy Liu'
 
 """

tushare/stock/rtq.py

@@ -182,7 +182,7 @@ def realtime_list(src: Optional[str] = None, interval: Optional[int] = 3,
             10、最高:HIGH
             11、最低:LOW
             12、今开:OPEN
-            13、昨收:PRE_CLOSE
+            13、昨收:PRICE
             14、量比:VOL_RATIO
             15、换手率:TURNOVER_RATE
             16、市盈率-动态:PE
@@ -201,7 +201,7 @@ def realtime_list(src: Optional[str] = None, interval: Optional[int] = 3,
             5、涨跌幅:PCT_CHANGE
             6、买入:BUY
             7、卖出:SALE
-            8、昨收:PRE_CLOSE
+            8、昨收:CLOSE
             9、今开:OPEN
             10、最高:HIGH
             11、最低:LOW
@@ -362,7 +362,7 @@ def get_stock_all_a_dc(page_count: Optional[int] = None,
             # "RANK",
             "TS_CODE",
             "NAME",
-            "CLOSE",
+            "PRICE",
             "PCT_CHANGE",
             "CHANGE",
             "VOLUME",
@@ -371,7 +371,7 @@ def get_stock_all_a_dc(page_count: Optional[int] = None,
             "HIGH",
             "LOW",
             "OPEN",
-            "PRE_CLOSE",
+            "CLOSE",
             "VOL_RATIO",
             "TURNOVER_RATE",
             "PE",
@@ -384,8 +384,8 @@ def get_stock_all_a_dc(page_count: Optional[int] = None,
             "1YEAR",
         ]
         # 指定要转换为 float 类型的列
-        cols_to_convert = ['CLOSE', 'PCT_CHANGE', 'CHANGE', "VOLUME", "AMOUNT", "SWING",
-                           'HIGH', "LOW", "OPEN", "PRE_CLOSE", "VOL_RATIO", "TURNOVER_RATE", "PE", "PB", "TOTAL_MV", "FLOAT_MV",
+        cols_to_convert = ['PRICE', 'PCT_CHANGE', 'CHANGE', "VOLUME", "AMOUNT", "SWING",
+                           'HIGH', "LOW", "OPEN", "CLOSE", "VOL_RATIO", "TURNOVER_RATE", "PE", "PB", "TOTAL_MV", "FLOAT_MV",
                            "RISE", "5MIN", "60DAY", "1YEAR"
                            ]
         # 使用 to_numeric() 方法将指定的列转换为 float 类型，并将非数值类型的数据转换为 NaN
@@ -429,12 +429,12 @@ def get_stock_all_a_sina(interval: Optional[int] = 3, page_count: Optional[int]
     :rtype: pandas.DataFrame
         1、代码:TS_CODE
         2、名称:NAME
-        3、最新价:CLOSE
+        3、最新价:PRICE
         4、涨跌额:CHANGE
         5、涨跌幅:PCT_CHANGE
         6、买入:BUY
         7、卖出:SALE
-        8、昨收:PRE_CLOSE
+        8、昨收:CLOSE
         9、今开:OPEN
         10、最高:HIGH
         11、最低:LOW
@@ -528,12 +528,12 @@ def get_stock_all_a_sina(interval: Optional[int] = 3, page_count: Optional[int]
     big_df.columns = [
         "TS_CODE",
         "NAME",
-        "CLOSE",
+        "PRICE",
         "CHANGE",
         "PCT_CHANGE",
         "BUY",
         "SALE",
-        "PRE_CLOSE",
+        "CLOSE",
         "OPEN",
         "HIGH",
         "LOW",
@@ -646,7 +646,7 @@ def format_str_to_float(x):
 if __name__ == '__main__':
     # df = realtime_quote(ts_code="000688.SH,000010.SH,000012.SH,399005.SZ", src="sina")
     # df = realtime_list(src="dc", page_count=1)
-    df = realtime_list(src="dc")
+    df = realtime_list(src="sina")
     print(df)
     # ts_code = '399005.SZ'
     # ts_code = '000001.SZ'

tushare/util/format_stock_code.py

@@ -17,6 +17,8 @@ def format_stock_code(x, special=""):
     @return:
     """
     x = str(x)
+    x = "".join(filter(str.isdigit, x))
+
     stock_len = 6
     hk_stock_len = 5
     if special:
@@ -44,15 +46,12 @@ def format_stock_code(x, special=""):
                 return '%s.SZ' % x
     if not x[0].isdigit():
         return x.upper()
-    if str(x[0:3]) in ['920']:
+    if str(x[0:3]) in ['920'] or str(x[0]) in ['8', '4']:
         x = x.zfill(stock_len) if len(x) < stock_len else x
         return '%s.BJ' % x
-    if str(x[0]) in ['5', '6', '9']:
+    if str(x[0]) in ['5', '6'] or str(x[0:3]) in ['900']:
         x = x.zfill(stock_len) if len(x) < stock_len else x
         return '%s.SH' % x
-    elif str(x[0]) in ['8', '4']:
-        x = x.zfill(stock_len) if len(x) < stock_len else x
-        return '%s.BJ' % x
     else:
         x = x.zfill(stock_len) if len(x) < stock_len else x
         return '%s.SZ' % x
@@ -119,5 +118,5 @@ if __name__ == '__main__':
     # s = symbol_verify("000001.SZ")
     # s = symbols_f("000001", special="港股")
     # s = verify_stock_or_index(x="399005.SZ")
-    s = format_stock_code(x="92052")
+    s = format_stock_code(x="sz92052")
     print(s)

{tushare-1.4.19.dist-info → tushare-1.4.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tushare
-Version: 1.4.19
+Version: 1.4.21
 Summary: A utility for crawling historical and Real-time Quotes data of China stocks
 Home-page: https://tushare.pro
 Author: Jimmy Liu
@@ -80,6 +80,15 @@ return::
     
 Log
 --------------
+1.4.21
+-------
+- 修复 realtime_list ts_code 格式化
+--------------
+--------------
+1.4.20
+-------
+- 修复 realtime_list 数值对应问题 close->price   pre_close->close
+--------------
 1.4.19
 -------
 - 修复 realtime_list 返回数据不全的问题

{tushare-1.4.19.dist-info → tushare-1.4.21.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tushare/__init__.py,sha256=1SENOQgZRlssTEGodSX6PtPoZJR3i6UOPwCegihtvRA,4778
+tushare/__init__.py,sha256=GBACL2TAwkfzq9fVqhrz0iL8RSK6UrzSG9MUusofUOY,4778
 tushare/bond/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tushare/bond/bonds.py,sha256=PJM0xDiWZDpOPwDtbEU9PdP0M_Gu0c599YuB1rbZ3r8,232
 tushare/coins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -35,7 +35,7 @@ tushare/stock/news_vars.py,sha256=CQ18hvyoeScelBCqKgF_rgAufoEALAUT8y_LERvZKHk,45
 tushare/stock/newsevent.py,sha256=STR7C8MjtZlaXTCG0QNaojBuK4-oxP_8hT7ZIvRpbiI,6944
 tushare/stock/ref_vars.py,sha256=MIxor-2rISl65I32vUzC-z7ZC_QFzG4sxOKDyjLWuU4,4449
 tushare/stock/reference.py,sha256=x_HZlrP58T-5OTZ7SLdf2Dh9THj1h7cT4wcIp42IHFI,38227
-tushare/stock/rtq.py,sha256=EPzVDbF0R6ojVrR17neEieR8-q5-ywcargLH0bFip1U,23949
+tushare/stock/rtq.py,sha256=xCCFfxG_iNKdCoETeekmTy3EvvFy5eFggimyDpQAocM,23927
 tushare/stock/rtq_vars.py,sha256=V6LeJkSP76z8veRfP_mGiQ63V5YBHoTMaqUA5hSBWh4,4200
 tushare/stock/shibor.py,sha256=Fx9OUZ429kz6l7ZdaYSD6p_X79ud69PDM9EZogm8xCY,6422
 tushare/stock/trading.py,sha256=3bvM4pexEYW-uGGEL7g6Vkte4sqGC1iYO6dC8mGLSdM,55619
@@ -61,7 +61,7 @@ tushare/util/common.py,sha256=KG86VdlhfnOf0j6SE2bBeowC_7Z54RqWpVnudS6KvEU,2581
 tushare/util/conns.py,sha256=mkcxGGD7-13GXMlrwmo4LMecmgWdm63I8KDpvcW53cI,1456
 tushare/util/dateu.py,sha256=YSvPvOlMY0qvT2IDwFNOHxTLBrPQ9ULGO7ljfu9tK3s,2931
 tushare/util/form_date.py,sha256=4nnjp6xo40FftsRP9YY1FJoPErxaWVCkjIp_3O1Qy7M,1119
-tushare/util/format_stock_code.py,sha256=5uQngRIqN6pzEHtI-AX_oBdHxRdOVpAvA_S41mCUY5I,3639
+tushare/util/format_stock_code.py,sha256=Te_1ZA2_0ivAV2kSKlalawlieJ6KQB77bA057baNcl0,3608
 tushare/util/formula.py,sha256=XZVK1NTF8BTrCo78EHLzjAM_wLAjxybrN7Q-6HCHmCo,6863
 tushare/util/mailmerge.py,sha256=y_QkfHvH8nQ7peC8wQs5idB6xW9PYzzrBynzxgo924M,8980
 tushare/util/netbase.py,sha256=URvOTLJSgO7e6uCmHHD9EeQ2TRvjpxIEF-wQaWx5cKE,942
@@ -72,8 +72,8 @@ tushare/util/verify_token.py,sha256=cuV3RErWbOC318NANCYL6K1LKZ3wSAL2yMwZHA7tD3s,
 tushare/util/protobuf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tushare/util/protobuf/funcs.py,sha256=UCdK8FxTyjPZsNzoEeXqYzqrQXUmRMvW5hua6GPA66A,779
 tushare/util/protobuf/response_pb2.py,sha256=vJH9ONkDuJlg6y-q1PvuDZoviKrK7hzNtMieQHK45DI,11347
-tushare-1.4.19.dist-info/LICENSE,sha256=C2j55UI0Ul-1-wA1-rn7OaY6b3vGl4YukiyvYzHsU9o,1503
-tushare-1.4.19.dist-info/METADATA,sha256=po7Jtf-7liUnFFassvlJQCrQalR5s-cLnKAjxwxWHpc,3108
-tushare-1.4.19.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-tushare-1.4.19.dist-info/top_level.txt,sha256=HHOxMuqc31KuAIcxpE0t5dAPMKbaiRtjsjTMFd7FlXI,8
-tushare-1.4.19.dist-info/RECORD,,
+tushare-1.4.21.dist-info/LICENSE,sha256=C2j55UI0Ul-1-wA1-rn7OaY6b3vGl4YukiyvYzHsU9o,1503
+tushare-1.4.21.dist-info/METADATA,sha256=Rw2lmLRj7yJylVm6n2qq8pY4trC1eUnKUnl87vjxfv4,3307
+tushare-1.4.21.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+tushare-1.4.21.dist-info/top_level.txt,sha256=HHOxMuqc31KuAIcxpE0t5dAPMKbaiRtjsjTMFd7FlXI,8
+tushare-1.4.21.dist-info/RECORD,,