tushare 1.4.16__py3-none-any.whl → 1.4.18__py3-none-any.whl

tushare/__init__.py

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

tushare/stock/rtq.py

@@ -636,16 +636,16 @@ 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="sina", page_count=1)
-    print(df)
+    # df = realtime_list(src="sina", page_count=1)
+    # print(df)
     # ts_code = '399005.SZ'
     # ts_code = '000001.SZ'
     # # ts_code = '836149.BJ'
     # # ts_code = '600000.SH'
     # # ts_code = '000001.SH'
     # # ts_code = '000010.SH'
-    # ts_code = '688111.SH'
-    # df = realtime_quote(src="dc", ts_code=ts_code)
-    # print(df)
+    ts_code = '600148.SH'
+    df = realtime_quote(src="dc", ts_code=ts_code)
+    print(df)
 
 

tushare/util/format_stock_code.py

@@ -16,50 +16,47 @@ def format_stock_code(x, special=""):
     @param special:
     @return:
     """
+    x = str(x)
+    stock_len = 6
+    hk_stock_len = 5
     if special:
         x = str(x)
         if "行业" in special or "概念" in special:
-            x = x.zfill(5) if len(x) < 5 else x
+            x = x.zfill(stock_len) if len(x) < stock_len else x
             return '%s.TI' % x
-        elif "港股" in special:
+        elif special == "港股":
             r = re.search(r"(\d+)", str(x), re.S | re.M)
             if not r:
                 return x
             else:
                 x = r.group(1)
-                x = x.zfill(5) if len(x) < 5 else x
+                x = x.zfill(hk_stock_len) if len(x) < hk_stock_len else x
             return '%s.HK' % x
         elif special == "场外基金" or special == "热基":
-            x = x.zfill(5) if len(x) < 5 else x
+            x = x.zfill(stock_len) if len(x) < stock_len else x
             return '%s.OF' % x
         elif special == "可转债":
             if str(x).startswith('11'):
-                x = x.zfill(5) if len(x) < 5 else x
+                x = x.zfill(stock_len) if len(x) < stock_len else x
                 return '%s.SH' % x
             elif str(x).startswith('12'):
-                x = x.zfill(5) if len(x) < 5 else x
+                x = x.zfill(stock_len) if len(x) < stock_len else x
                 return '%s.SZ' % x
-
-    if not x[0].isdigit():
-        r = re.search(r"(\d+)", str(x), re.S | re.M)
-        if not r:
-            return x.upper()
-        else:
-            x = r.group(1)  # # return f"{r.group(1)}.{str(x).split(r.group(1))[0]}"
-
     if not x[0].isdigit():
         return x.upper()
+    if str(x[0:3]) in ['920']:
+        x = x.zfill(stock_len) if len(x) < stock_len else x
+        return '%s.BJ' % x
     if str(x[0]) in ['5', '6', '9']:
-        x = x.zfill(5) if len(x) < 5 else x
+        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(5) if len(x) < 5 else x
+        x = x.zfill(stock_len) if len(x) < stock_len else x
         return '%s.BJ' % x
     else:
-        x = x.zfill(5) if len(x) < 5 else x
+        x = x.zfill(stock_len) if len(x) < stock_len else x
         return '%s.SZ' % x
 
-
 def a_symbol_verify(x):
     l = str(x).upper().split(".")
     if not x[-1].isdigit():
@@ -107,6 +104,8 @@ def verify_stock_or_index(x):
         return True
     elif x.startswith('4') and x.endswith('BJ'):
         return True
+    elif x.startswith('920') and x.endswith('BJ'):
+        return True
     elif x.startswith('9') and x.endswith('CSI'):
         return False
     else:
@@ -119,5 +118,6 @@ if __name__ == '__main__':
     # s = symbol_verify("sz000001")
     # s = symbol_verify("000001.SZ")
     # s = symbols_f("000001", special="港股")
-    s = verify_stock_or_index(x="399005.SZ")
+    # s = verify_stock_or_index(x="399005.SZ")
+    s = format_stock_code(x="92052")
     print(s)

{tushare-1.4.16.dist-info → tushare-1.4.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tushare
-Version: 1.4.16
+Version: 1.4.18
 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,10 @@ return::
     
 Log
 --------------
+1.4.17
+-------
+- 修复 920 开头更改是北交所
+-------
 1.4.14
 -------
 - 修复 realtime_list (爬虫版)

{tushare-1.4.16.dist-info → tushare-1.4.18.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tushare/__init__.py,sha256=WGp2WFHHZkVf028VsTtx31RvngjcKDEFQCE4Zt3JFcE,4778
+tushare/__init__.py,sha256=2L3HKsXb_jdZ_osmal0V9cG7Glc85chMkAFchG_1XeY,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=28HBzyrJ2VwP93_9edkLBWgllezgrUJoS_WZc6RYFgA,23161
+tushare/stock/rtq.py,sha256=uMljEz2030OE-i_JAkeSwM1gghK4g5omTx4mC0EqTVc,23159
 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=StCPAMbFiu-SVU4vAcCMhW9SkMPyW1sTUHgPSzC-QPw,3452
+tushare/util/format_stock_code.py,sha256=5uQngRIqN6pzEHtI-AX_oBdHxRdOVpAvA_S41mCUY5I,3639
 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.16.dist-info/LICENSE,sha256=C2j55UI0Ul-1-wA1-rn7OaY6b3vGl4YukiyvYzHsU9o,1503
-tushare-1.4.16.dist-info/METADATA,sha256=6cwUt3uKNk6ItLZukKycsUOZvHvfdia9ivJR1FOK-S8,2965
-tushare-1.4.16.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-tushare-1.4.16.dist-info/top_level.txt,sha256=HHOxMuqc31KuAIcxpE0t5dAPMKbaiRtjsjTMFd7FlXI,8
-tushare-1.4.16.dist-info/RECORD,,
+tushare-1.4.18.dist-info/LICENSE,sha256=C2j55UI0Ul-1-wA1-rn7OaY6b3vGl4YukiyvYzHsU9o,1503
+tushare-1.4.18.dist-info/METADATA,sha256=CVHRLIhtj6fvzzYRjivj5_Z71cZFIKuInm9IY7E1nUE,3030
+tushare-1.4.18.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+tushare-1.4.18.dist-info/top_level.txt,sha256=HHOxMuqc31KuAIcxpE0t5dAPMKbaiRtjsjTMFd7FlXI,8
+tushare-1.4.18.dist-info/RECORD,,

{tushare-1.4.16.dist-info → tushare-1.4.18.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: setuptools (71.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any