tushare 1.4.16__tar.gz → 1.4.18__tar.gz

{tushare-1.4.16 → tushare-1.4.18}/PKG-INFO

@@ -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 → tushare-1.4.18}/setup.py

@@ -64,6 +64,10 @@ return::
     
 Log
 --------------
+1.4.17
+-------
+- 修复 920 开头更改是北交所
+-------
 1.4.14
 -------
 - 修复 realtime_list (爬虫版)
@@ -103,7 +107,7 @@ def read_install_requires():
 
 setup(
     name='tushare',
-    version='1.4.16',
+    version='1.4.18',
     description='A utility for crawling historical and Real-time Quotes data of China stocks',
     # long_description=read("README.rst"),
     long_description=long_desc,

{tushare-1.4.16 → tushare-1.4.18}/tushare/__init__.py

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

{tushare-1.4.16 → tushare-1.4.18}/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-1.4.16 → tushare-1.4.18}/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 → tushare-1.4.18}/tushare.egg-info/PKG-INFO

@@ -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 (爬虫版)