siat 3.10.75__py3-none-any.whl → 3.10.125__py3-none-any.whl

siat/financial_statements.py

@@ -52,14 +52,8 @@ def get_balance_sheet(symbol):
     try:
         stmta=stock.balance_sheet()  # Defaults to Annual
     except:
-        print("  Searching for annual report failed, recovering......")
-        sleep_random(max_sleep=60)
-        
-        try:
-            stmta=stock.balance_sheet()
-        except:
-            print("  #Warning(get_balance_sheet): no annual info available for",symbol)
-            return None
+        print("  #Warning(get_balance_sheet): no annual info available for",symbol)
+        return None
         
     if isinstance(stmta,dict):
             print("  #Warning(get_balance_sheet): Yahoo Finance currently unaccessable for",symbol)
@@ -76,14 +70,8 @@ def get_balance_sheet(symbol):
     try:
         stmtq=stock.balance_sheet(frequency="q")
     except:
-        print("  Searching for quarterly report failed, recovering......")
-        sleep_random(max_sleep=60)
-        
-        try:
-            stmtq=stock.balance_sheet(frequency="q")
-        except:
-            print("  #Warning(get_balance_sheet): no quarterly info available for",symbol)
-            return None
+        print("  #Warning(get_balance_sheet): no quarterly info available for",symbol)
+        return None
         
     if isinstance(stmtq,dict):
             print("  #Warning(get_balance_sheet): Yahoo Finance currently unaccessable for",symbol)
@@ -196,17 +184,12 @@ def get_income_statements(symbol):
     try:
         stmta=stock.income_statement()  # Defaults to Annual
     except:
-        print("  Searching for annual report failed, recovering......")
-        sleep_random(max_sleep=60)
-        try:
-            stmta=stock.income_statement()
-        except:
-            print("  #Warning(get_income_statements): no annual info available for",symbol)
-            return None
+        print("  #Warning(get_income_statements): no annual info available for",symbol)
+        return None
 
     if isinstance(stmta,dict):
-            print("  #Warning(get_balance_sheet): Yahoo Finance currently unaccessable for",symbol)
-            return None
+        print("  #Warning(get_balance_sheet): Yahoo Finance currently unaccessable for",symbol)
+        return None
         
     """
     #判断是否抓取到了数据
@@ -219,17 +202,12 @@ def get_income_statements(symbol):
     try:
         stmtq=stock.income_statement(frequency="q")
     except:
-        print("  Searching for quarterly report failed, recovering......")
-        sleep_random(max_sleep=60)
-        try:
-            stmtq=stock.income_statement(frequency="q")
-        except:
-            print("  #Warning(get_income_statements): no quarterly info available for",symbol)
-            return None
+        print("  #Warning(get_income_statements): no quarterly info available for",symbol)
+        return None
         
     if isinstance(stmtq,dict):
-            print("  #Warning(get_balance_sheet): Yahoo Finance currently unaccessable for",symbol)
-            return None
+        print("  #Warning(get_balance_sheet): Yahoo Finance currently unaccessable for",symbol)
+        return None
         
     """
     if (len(stmta)==0) and (len(stmtq)==0):
@@ -311,17 +289,12 @@ def get_cashflow_statements(symbol):
     try:
         stmta=stock.cash_flow()  # Defaults to Annual
     except:
-        print("  Searching for annual report failed, recovering......")
-        sleep_random(max_sleep=60)
-        try:
-            stmta=stock.cash_flow()
-        except:
-            print("  #Warning(get_cashflow_statements): no annual info available for",symbol)
-            return None
+        print("  #Warning(get_cashflow_statements): no annual info available for",symbol)
+        return None
 
     if isinstance(stmta,dict):
-            print("  #Warning(get_balance_sheet): Yahoo Finance currently unaccessable for",symbol)
-            return None    
+        print("  #Warning(get_balance_sheet): Yahoo Finance currently unaccessable for",symbol)
+        return None    
         
     """
     #判断是否抓取到了数据
@@ -334,17 +307,12 @@ def get_cashflow_statements(symbol):
     try:
         stmtq=stock.cash_flow(frequency="q")
     except:
-        print("  Searching for quarterly report failed, recovering......")
-        sleep_random(max_sleep=60)
-        try:
-            stmtq=stock.cash_flow(frequency="q")
-        except:
-            print("  #Warning(get_cashflow_statements): no quarterly info available for",symbol)
-            return None
+        print("  #Warning(get_cashflow_statements): no quarterly info available for",symbol)
+        return None
         
     if isinstance(stmtq,dict):
-            print("  #Warning(get_balance_sheet): Yahoo Finance currently unaccessable for",symbol)
-            return None
+        print("  #Warning(get_balance_sheet): Yahoo Finance currently unaccessable for",symbol)
+        return None
         
     """
     if (len(stmta)==0) and (len(stmtq)==0):
@@ -408,17 +376,8 @@ def get_financial_statements(ticker):
     try:
         fbs = get_balance_sheet(ticker)
     except:
-        print("  Retrieving fin info failed, trying to recover...")
-        sleep_random(max_sleep=60)
-        try:
-            fbs = get_balance_sheet(ticker)
-        except:
-            sleep_random(max_sleep=60)
-            try:
-                fbs = get_balance_sheet(ticker)
-            except:
-                print("  #Error(get_financial_statements): balance sheet not available for",ticker)
-                return None
+        print("  #Error(get_financial_statements): balance sheet not available for",ticker)
+        return None
     if fbs is None:
         print("  #Error(get_financial_statements): financial statements not available for",ticker)
         return None
@@ -427,17 +386,8 @@ def get_financial_statements(ticker):
     try:
         fis = get_income_statements(ticker)
     except:
-        print("      Failed, recovering...")
-        sleep_random(max_sleep=60)
-        try:
-            fis = get_income_statements(ticker)
-        except:
-            sleep_random(max_sleep=60)
-            try:
-                fis = get_income_statements(ticker)
-            except:
-                print("  #Error(get_financial_statements): income info not available for",ticker)
-                return None
+        print("  #Error(get_financial_statements): income info not available for",ticker)
+        return None
     if fis is None:
         print("  #Error(get_financial_statements): financial statements not available for",ticker)
         return None
@@ -446,17 +396,8 @@ def get_financial_statements(ticker):
     try:
         fcf = get_cashflow_statements(ticker)
     except:
-        print("      Failed, recovering...")
-        sleep_random(max_sleep=60)
-        try:
-            fcf = get_cashflow_statements(ticker)
-        except:
-            sleep_random(max_sleep=60)
-            try:
-                fcf = get_cashflow_statements(ticker)
-            except:
-                print("  #Error(get_financial_statements): cash flow info not available for",ticker)
-                return None
+        print("  #Error(get_financial_statements): cash flow info not available for",ticker)
+        return None
     if fcf is None:
         print("  #Error(get_financial_statements): financial statements not available for",ticker)
         return None

siat/financials.py

@@ -1991,6 +1991,7 @@ if __name__=='__main__':
 
 def compare_dupont(tickerlist,fsdate='latest', \
                    sort='PM',facecolor='whitesmoke',font_size='16px', \
+                       loc1='best',retry=10, \
                    scale1 = 10,scale2 = 10,hatchlist=['.', 'o', '\\']):
     """
     功能：获得tickerlist中每只股票的杜邦分析项目，绘制柱状叠加比较图
@@ -2034,34 +2035,56 @@ def compare_dupont(tickerlist,fsdate='latest', \
     dpidflist,dpilist,fsdatelist,fstypelist=[],[],[],[]
     name1list,name2list,name3list,name4list,name5list,name6list=[],[],[],[],[],[]
     newtickerlist=[]
-    print("  Working on DuPont factsheet for specified stocks ...")
+    print("Working on DuPont factsheet, it takes a very long time, take a breather ...")
+    
+    #第1次尝试
+    faillist=[]
     for t in tickerlist:
         try:
             with HiddenPrints():
                 dpidf=calc_dupont(t)
         except:
-            print("  #Warning(compare_dupont): lack of some accounting items for",t)
+            print("  #Warning(compare_dupont): found errors in accounting items, ignore",t)
             continue
         
         #未出错，但未抓取到数据，再试
-        if dpidf is None:
-            print(f"  #Warning(compare_dupont): failed to get data for {t}, retrying ...")
-            sleep_random(max_sleep=30)
-            with HiddenPrints():
-                dpidf=calc_dupont(t)
-            
-            if dpidf is None: continue
+        if dpidf is None: 
+            faillist=faillist+[t]
+            #sleep_random(max_sleep=30)
+            continue
         
         if fsdate == 'latest': 
             try:
                 dpi=dpidf.tail(1)
             except:
-                print("  #Warning(compare_dupont): got empty data for",t)               
+                print(f"  #Warning(compare_dupont): got empty data for {t} @ {fsdate} financials")
+                faillist=faillist+[t]
+                #sleep_random(max_sleep=30)
+                continue
+        elif fsdate == 'annual':
+            dpidf_tmp=dpidf[dpidf['periodType']=="12M"]
+            try:
+                dpi=dpidf_tmp.tail(1)
+            except:
+                print(f"  #Warning(compare_dupont): got empty data for {t} @ {fsdate} financials")  
+                faillist=faillist+[t]
+                #sleep_random(max_sleep=30)
+                continue
+                
+        elif fsdate == 'quarterly':
+            dpidf_tmp=dpidf[dpidf['periodType']=="3M"]
+            try:
+                dpi=dpidf_tmp.tail(1)
+            except:
+                print(f"  #Warning(compare_dupont): got empty data for {t} @ {fsdate} financials")  
+                faillist=faillist+[t]
+                #sleep_random(max_sleep=30)
                 continue
-            
         else: dpi=dpidf[dpidf['endDate']==fsdate]
         if len(dpi) == 0:
-            print("  #Warning(compare_dupont): lack of some accounting items for",t,'@',fsdate)
+            print("  #Warning(compare_dupont): financial statements not found for",t,'@',fsdate)
+            faillist=faillist+[t]
+            #sleep_random(max_sleep=30)
             continue
         
         newtickerlist=newtickerlist+[t]
@@ -2078,7 +2101,84 @@ def compare_dupont(tickerlist,fsdate='latest', \
         name6list=name6list+[dpi['periodType'][0]]
         
         #显示进度
-        print_progress_percent2(t,tickerlist,steps=5,leading_blanks=4)
+        #print_progress_percent2(t,tickerlist,steps=5,leading_blanks=4)
+        print(f"  *** Successfully obtained financial information for {t}")
+    
+    #第2次尝试
+    for i in range(retry):
+        if len(faillist) == 0: break
+    
+        tickerlist=faillist
+        faillist=[]
+        
+        for t in tickerlist:
+            try:
+                with HiddenPrints():
+                    dpidf=calc_dupont(t)
+            except:
+                print("  #Warning(compare_dupont): found errors in accounting items, ignore",t)
+                continue
+            
+            #未出错，但未抓取到数据，再试
+            if dpidf is None: 
+                faillist=faillist+[t]
+                #sleep_random(max_sleep=30)
+                continue
+            
+            if fsdate == 'latest': 
+                try:
+                    dpi=dpidf.tail(1)
+                except:
+                    print(f"  #Warning(compare_dupont): got empty data for {t} @ {fsdate} financials")
+                    faillist=faillist+[t]
+                    #sleep_random(max_sleep=30)
+                    continue
+            elif fsdate == 'annual':
+                dpidf_tmp=dpidf[dpidf['periodType']=="12M"]
+                try:
+                    dpi=dpidf_tmp.tail(1)
+                except:
+                    print(f"  #Warning(compare_dupont): got empty data for {t} @ {fsdate} financials")  
+                    faillist=faillist+[t]
+                    #sleep_random(max_sleep=30)
+                    continue
+                    
+            elif fsdate == 'quarterly':
+                dpidf_tmp=dpidf[dpidf['periodType']=="3M"]
+                try:
+                    dpi=dpidf_tmp.tail(1)
+                except:
+                    print(f"  #Warning(compare_dupont): got empty data for {t} @ {fsdate} financials")  
+                    faillist=faillist+[t]
+                    #sleep_random(max_sleep=30)
+                    continue
+            else: dpi=dpidf[dpidf['endDate']==fsdate]
+            if len(dpi) == 0:
+                print("  #Warning(compare_dupont): financial statements not found for",t,'@',fsdate)
+                faillist=faillist+[t]
+                #sleep_random(max_sleep=30)
+                continue
+            
+            newtickerlist=newtickerlist+[t]
+            dpidflist=dpidflist+[dpidf]
+            dpilist=dpilist+[dpi]
+            fsdatelist=fsdatelist+[dpi['endDate'][0]]
+            fstypelist=fstypelist+[dpi['periodType'][0]]
+            
+            name1list=name1list+[dpi['Profit Margin'][0]*scale1]
+            name2list=name2list+[dpi['Total Asset Turnover'][0]*scale2]
+            name3list=name3list+[dpi['Equity Multiplier'][0]]
+            name4list=name4list+[dpi['ROE'][0]]
+            name5list=name5list+[dpi['endDate'][0]]
+            name6list=name6list+[dpi['periodType'][0]]
+            
+            #显示进度
+            #print_progress_percent2(t,tickerlist,steps=5,leading_blanks=4)
+            print(f"  *** Successfully obtained financial information for {t}")
+
+
+    if len(faillist) > 0:
+        print(f"  ~~~ Pity: failed to fetch financials for {faillist}")
     
     tickerlist=newtickerlist
     raw_data = {ticker:tickerlist,
@@ -2168,7 +2268,7 @@ def compare_dupont(tickerlist,fsdate='latest', \
         footnote2=footnote1+'\n'+texttranslate("数据来源: 雅虎财经,")+' '+str(today)
     plt.xlabel(footnote2,fontsize=xlabel_txt_size)
     
-    plt.legend(loc='best',fontsize=legend_txt_size)
+    plt.legend(loc=loc1,fontsize=legend_txt_size)
     if lang == 'Chinese':
         plt.title("杜邦分析对比图"+sorttxt,fontsize=title_txt_size,fontweight='bold')
     else:

siat/financials_china.py

@@ -692,7 +692,7 @@ def compare_dupont_china(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10, \
     可用的符号：'-', '+', 'x', '\\', '*', 'o', 'O', '.'    
     """
     error_flag=False
-    if fsdate=='latest':
+    if fsdate in ['latest','annual','quarterly']:
         import datetime as dt; end=str(dt.date.today())
         start=date_adjust(end, adjust=-365)
     else:

siat/fund_china.py

@@ -1754,9 +1754,10 @@ if __name__=='__main__':
 
 #==============================================================================
 if __name__=='__main__':
-    fund='159922.SS'
-    fromdate='2020-1-1'
-    todate='2020-10-16'
+    ticker='159922.SS'
+    ticker='510580'
+    start='2025-1-1'
+    end='2025-5-30'
 
 def etf_trend_china(ticker,start,end='today',indicator='净值',power=0, \
                     average_value=True,facecolor='whitesmoke', \
@@ -1765,7 +1766,7 @@ def etf_trend_china(ticker,start,end='today',indicator='净值',power=0, \
     功能：ETF基金业绩趋势，单位净值，累计净值
     """
     fund=ticker
-    fromdate,todate=start_end_preprocess(start,end='today')
+    fromdate,todate=start_end_preprocess(start,end)
     
     indicator_list=['净值','单位净值','累计净值']
     if indicator not in indicator_list:
@@ -1789,7 +1790,7 @@ def etf_trend_china(ticker,start,end='today',indicator='净值',power=0, \
     
     #获取基金数据
     fund1=fund[:6]
-    df = etf_hist_df = ak.fund_etf_fund_info_em(fund1)
+    df = ak.fund_etf_fund_info_em(fund1)
     df['date']=pd.to_datetime(df['净值日期'])
     df.set_index(['date'],inplace=True) 
     df['单位净值']=df['单位净值'].astype("float")

siat/future_china.py

@@ -218,11 +218,14 @@ if __name__=='__main__':
     end='2025-5-30'
     power=1
 
-def future_price_china(code,start,end,power=0,loc1='upper left',loc2='upper right'):
+def future_price_china(code,start='MRM',end='today', \
+                       power=0,loc1='upper left',loc2='upper right'):
     """
     综合程序：
     绘制内盘期货交易曲线：收盘价vs结算价vs成交量
     """
+    start,end=start_end_preprocess(start,end)
+    
     print("Searching for contract "+code+", it may take time ...")
     #日期变换
     start1=convert_date_ts(start)
@@ -482,11 +485,14 @@ if __name__=='__main__':
     end='2021-9-27'
     power=0
 
-def future_price_foreign(code,start,end,power=0,loc1='upper left',loc2='upper right'):
+def future_price_foreign(code,start='MRM',end='today', \
+                         power=0,loc1='upper left',loc2='upper right'):
     """
     综合程序：
     绘制中国外盘期货的交易趋势：收盘价vs成交量
     """
+    start,end=start_end_preprocess(start,end)
+    
     print("Searching for contract "+code+", it costs great time, just take a break...")
     #日期变换
     flag,start1,end1=check_period(start,end)

siat/holding_risk.py

@@ -562,28 +562,29 @@ def get_VaR_portfolio(portfolio,today,future_days=1,alpha=0.99, \
     if not printout: return VaRlist,ratiolist
     
     #输出VaR金额和比率
-    print("\n===== 投资组合的在险价值VaR =====")
-    _,_,tickerlist,sharelist,ticker_type=decompose_portfolio(portfolio)
-    print("成分股列表  :",tickerlist)
-    print("成分股的配置:",sharelist)
-    print("当前日期    :",today)
-    print("当前头寸    :",format(position,','))
-    print("预计持有天数:",future_days)
-    print("置信度水平  :",str(int(alpha*100))+'%')
-    print("历史样本年数:",pastyears)
-    print("样本数量    :",num)
+    print("\n===== 在险价值VaR：投资组合 =====")
+    #_,_,tickerlist,sharelist,ticker_type=decompose_portfolio(portfolio)
+    #print("成分股列表  :",tickerlist)
+    #print("成分股的配置:",sharelist)
+    print("投资组合：",portfolio_name(portfolio))
+    print("当前日期：",today)
+    print("当前头寸(1份投资组合)：",format(position,','))
+    print("预计持有天数：",future_days)
+    print("置信度水平：",str(int(alpha*100))+'%')
+    print("历史样本年数：",pastyears)
+    print("样本数量：",num)
     
     import datetime as dt; today=dt.date.today()
-    footnote="*数据来源：新浪/stooq，"+str(today)
+    footnote="\n数据来源：新浪/stooq，"+str(today)
     if not (modeltyp == 'all'):
-        print("使用的模型  :",model)
-        print("VaR金额/比率:",format(VaR,','), \
+        print("使用的模型：",model)
+        print("VaR金额/比率：",format(VaR,','), \
               '\b，',str(round(VaR_ratio*100,2))+'%')
         
         print(footnote)
         return VaR,VaR_ratio
     
-    print("\nVaR金额/比率：")
+    print("\n*** VaR金额/比率 ***")
     modellist.pop()
     for m in modellist:
         pos=modellist.index(m)
@@ -687,27 +688,28 @@ def get_ES_portfolio(portfolio,today,future_days=1,alpha=0.99, \
     
     #输出ES金额和比率
     print("\n===== 投资组合的预期不足ES =====")
-    _,_,tickerlist,sharelist,ticker_type=decompose_portfolio(portfolio)
-    print("成分股列表  :",tickerlist)
-    print("成分股配置  :",sharelist)
-    print("当前日期    :",today)
-    print("当前头寸    :",format(position,','))
-    print("预计持有天数:",future_days)
-    print("置信度水平  :",str(int(alpha*100))+'%')
-    print("历史样本年数:",pastyears)
-    print("样本个数    :",num)
+    #_,_,tickerlist,sharelist,ticker_type=decompose_portfolio(portfolio)
+    #print("成分股列表  :",tickerlist)
+    #print("成分股配置  :",sharelist)
+    print("投资组合：",portfolio_name(portfolio))
+    print("当前日期：",today)
+    print("当前头寸(1份投资组合)：",format(position,','))
+    print("预计持有天数：",future_days)
+    print("置信度水平：",str(int(alpha*100))+'%')
+    print("历史样本年数：",pastyears)
+    print("样本个数：",num)
 
     import datetime as dt; today=dt.date.today()
-    footnote="*数据来源：新浪/stooq，"+str(today)
+    footnote="\n数据来源：新浪/stooq，"+str(today)
     
     if not (modeltyp == 'all'):
-        print("使用的模型  :",model)
-        print("ES金额/比率 ：",format(ES,','), \
+        print("使用的模型：",model)
+        print("ES金额/比率：",format(ES,','), \
               '\b,',str(round(ES_ratio*100,2))+'%')
         print(footnote)
         return ES,ES_ratio
     
-    print("ES金额/比率 ：")
+    print("ES金额/比率：")
     modellist.pop()
     for m in modellist:
         pos=modellist.index(m)
@@ -799,13 +801,15 @@ if __name__ == '__main__':
     fromdate='2022-1-1'
     todate='2022-4-18'
 
-def portfolio_rets_curve(portfolio,fromdate,todate):
+def portfolio_rets_curve(portfolio,start='MRY',end='today'):
     """
     功能：绘制投资组合portfolio在给定期间（fromdate,todate）收益率分布的曲线，
     并于相应的正态分布图对照
     显示：收益率分布的直方图(实线)，相应的正态分布图(虚线)
     x轴为收益率(非百分比)，y轴为频度(Frequency)
     """
+    fromdate,todate=start_end_preprocess(start,end)
+    
     #抓取投资组合股价和收益率
     prices=get_portfolio_prices0(portfolio,fromdate,todate)
     if prices is None: return None,None
@@ -833,22 +837,25 @@ def portfolio_rets_curve(portfolio,fromdate,todate):
     #plt.ylabel('Frequency')
     
     footnote1='日收益率%'
-    footnote2='\nShapiro-Wilk检验：W值'+str(W)+'，p值'+str(p_value)
-    footnote3="\n偏度"+str(S)+"，峰度"+str(K)
+    footnote2='\n【注】Shapiro-Wilk检验：W值'+str(W)+'，p值'+str(p_value)
+    footnote3="。偏度"+str(S)+"，峰度"+str(K)
     
     import datetime as dt; today=dt.date.today()
-    footnote4="\n*数据来源：新浪/stooq，"+str(today)
+    footnote4="。数据来源：新浪/stooq，"+str(today)
     
     footnote=footnote1+footnote2+footnote3+footnote4
     plt.xlabel(footnote)
     
     plt.legend(loc='best')
+    """
     titletxt1="投资组合收益率的正态分布检验"
     titletxt2="\n成分股"+str(tickerlist)
     titletxt3="\n持仓配置"+str(sharelist)
     titletxt4="\n样本期间："+str(fromdate)+'至'+str(todate)+ \
                 '，样本数量'+str(num)+'个'
     titletxt=titletxt1+titletxt2+titletxt3+titletxt4
+    """
+    titletxt="投资组合收益率的正态分布检验："+portfolio_name(portfolio)
     plt.title(titletxt)
     
     plt.gca().set_facecolor('whitesmoke')

siat/market_china.py

@@ -123,11 +123,13 @@ def market_profile_china(market='SSE'):
                     if lang == 'Chinese':
                         i2=itemlist2[pos]
                         blanknum=maxlen-hzlen(i2)
-                        print('   ',i2+' '*blanknum+'：',end='')
+                        #print('   ',i2+' '*blanknum+'：',end='')
+                        print('   ',i2+'：',end='')
                     else:
                         i2e=itemlist2e[pos]
                         blanknum=maxlen-hzlen(i2e)
-                        print('   ',i2e+' '*blanknum+'：',end='')
+                        #print('   ',i2e+' '*blanknum+'：',end='')
+                        print('   ',i2e+'：',end='')
                 except:
                     pos=itemlist.index(i)
                     i2=itemlist2[pos]
@@ -136,10 +138,12 @@ def market_profile_china(market='SSE'):
                     
                     if lang == 'Chinese':
                         blanknum=maxlen-hzlen(i2)
-                        print('   ',i2+' '*blanknum+'：',end='')
+                        #print('   ',i2+' '*blanknum+'：',end='')
+                        print('   ',i2+'：',end='')
                     else:
                         blanknum=maxlen-hzlen(i2e)
-                        print('   ',i2e+' '*blanknum+'：',end='')
+                        #print('   ',i2e+' '*blanknum+'：',end='')
+                        print('   ',i2e+'：',end='')
                 
                 if i in ["上市股票",'上市公司']: #若是字符则转换成数字
                     value2=int(value)
@@ -231,11 +235,13 @@ def market_profile_china(market='SSE'):
                     if lang == 'Chinese':
                         i2=itemlist2[pos]
                         blanknum=maxlen-hzlen(i2)
-                        print('   ',i2+' '*blanknum+'：',end='')
+                        #print('   ',i2+' '*blanknum+'：',end='')
+                        print('   ',i2+'：',end='')
                     else:
                         i2e=itemlist2e[pos]
                         blanknum=maxlen-hzlen(i2e)
-                        print('   ',i2e+' '*blanknum+'：',end='')
+                        #print('   ',i2e+' '*blanknum+'：',end='')
+                        print('   ',i2e+'：',end='')
                 except:
                     pos=itemlist.index(i)
                     i2=itemlist2[pos]
@@ -244,10 +250,12 @@ def market_profile_china(market='SSE'):
                     
                     if lang == 'Chinese':
                         blanknum=maxlen-hzlen(i2)
-                        print('   ',i2+' '*blanknum+'：',end='')
+                        #print('   ',i2+' '*blanknum+'：',end='')
+                        print('   ',i2+'：',end='')
                     else:
                         blanknum=maxlen-hzlen(i2e)
-                        print('   ',i2e+' '*blanknum+'：',end='')
+                        #print('   ',i2e+' '*blanknum+'：',end='')
+                        print('   ',i2e+'：',end='')
                 
                 if i in ['数量']: #若是字符则转换成数字
                     value2=int(value)
@@ -354,11 +362,13 @@ def market_profile_china_tmp(market='SSE'):
                 value=list(subdf[subdf['item']==i]['number'])[0]
                 
                 if lang == 'Chinese':
-                    print('   ',i+' '*blanknum+'：',end='')
+                    #print('   ',i+' '*blanknum+'：',end='')
+                    print('   ',i+'：',end='')
                 else:
                     pos=itemlist.index(i)
                     ie=itemliste[pos]
-                    print('   ',ie+' '*blanknum+'：',end='')
+                    #print('   ',ie+' '*blanknum+'：',end='')
+                    print('   ',ie+'：',end='')
                     
                 print("{:,}".format(value))