siat 2.14.1__py3-none-any.whl → 3.0.0__py3-none-any.whl

siat/compare_cross.py

@@ -37,7 +37,8 @@ if __name__=='__main__':
     
     df1=fetch_price_stock(ticker,start,end)
     
-def fetch_price_stock(ticker,start,end,info_types=['Close','Volume'],adjust=-2*365):
+def fetch_price_stock(ticker,start,end,info_types=['Close','Volume'], \
+                      adjust=-2*365,ticker_type='auto'):
     """
     功能：获取股票、大盘指数、ETF和REITS的价格
     ticker：股票代码
@@ -78,7 +79,10 @@ def fetch_price_stock(ticker,start,end,info_types=['Close','Volume'],adjust=-2*3
     df['Adj Close']=df['Close']        
     df['Code']=ticker
     df['Type']='stock'
-    df['Name']=codetranslate(ticker)
+    
+    #预处理ticker_type
+    ticker_type=ticker_type_preprocess_mticker_mixed(ticker,ticker_type)    
+    df['Name']=ticker_name(ticker,ticker_type)
     
     return df
      
@@ -142,83 +146,6 @@ def fetch_price_stock_portfolio(portfolio,start,end,info_types=['Close','Volume'
     
     return df
 
-#==============================================================================
-if __name__=='__main__':
-    ticker='850831'
-    
-    start='2023-1-1'
-    end='2023-4-4'
-    info_types=['Close','Volume']
-    
-    df3=fetch_price_swindex(ticker,start,end)
-
-def fetch_price_swindex(ticker,start,end,info_types=['Close','Volume'],adjust=-2*365):
-    """
-    功能：获取申万行业指数的信息
-    ticker：申万行业指数
-    start,end：日期期间
-    info_types：信息测度，默认['Close']，还可以为['Close','Open','High','Low',
-                                     'Volume','Adj Close']
-    特点：为compare_indicator使用，包括指数名称
-    """
-    # 检查日期期间的合理性
-    result,startpd,endpd=check_period(start,end)
-    if not result:
-        print("  #Error(fetch_price_swindex): invalid date period between",start,"and",end)
-        return None
-    
-    start1=date_adjust(start,adjust=adjust)
-    _,start1pd,_=check_period(start1,end)
-    
-    import akshare as ak
-    try:
-        prices= ak.index_hist_sw(symbol=ticker,period="day")
-    except:
-        print("  #Error(fetch_price_swindex): failed to fetch stock prices for",ticker)
-        return None
-    
-    if prices is None:
-        print("  #Warning(fetch_price_swindex): no info found for",ticker,"during",start,"and",end)
-        return None
-    
-    if len(prices)==0:
-        print("  #Warning(fetch_price_swindex): zero record found for",ticker,"during",start,"and",end)
-        return None
-
-    prices.columns=['Code','Date','Close','Open','High','Low','Volume','Amount']
-    million=1000000
-    prices['Volume']=prices['Volume']*million
-    prices['Amount']=prices['Amount']*million
-    
-    import pandas as pd
-    prices['date']=pd.to_datetime(prices['Date'])
-    prices.set_index('date',inplace=True)
-    
-    prices2=prices[(prices.index >= start1pd) & (prices.index <= endpd)]
-
-    
-    if isinstance(info_types,str):
-        typelist=[info_types]
-    else:
-        typelist=info_types
-
-    import pandas as pd
-    df=pd.DataFrame()
-        
-    for t in typelist:
-        try:
-            df[t]=prices2[t]
-        except:
-            continue
-
-    df['Adj Close']=df['Close']        
-    df['Code']=ticker
-    df['Type']='swindex'
-    df['Name']='申万'+industry_sw_name(ticker)+'指数'
-    
-    print("  Successfully retrieved",len(df),"records for sw index",ticker)
-    
-    return df
 
 #==============================================================================
 if __name__=='__main__':
@@ -349,7 +276,7 @@ def compare_mrar_cross(dflist,rar_name,start,end, \
                  RF=False,window=252, \
                  axhline_value=0,axhline_label='零线',graph=True,printout=False, \
                  sortby='tpw_mean',scope='China', \
-                 loc='best',annotate=False):
+                 loc='best',annotate=False,ticker_type='auto'):
     """
     功能：计算多种证券的rar比率，并绘图对比
     比率：支持夏普比率、特雷诺比率、索替诺比率、阿尔法比率等
@@ -428,9 +355,15 @@ def compare_mrar_cross(dflist,rar_name,start,end, \
     ds=None
     if printout:
         dfcols=list(df2)
+        
+        #预处理ticker_type
+        ticker_type_list=ticker_type_preprocess_mticker_mixed(dfcols,ticker_type)        
+        
         for c in dfcols:
-            #ccn=codetranslate(c)+'('+c+')'
-            ccn=codetranslate(c)
+            #ccn=ticker_name(c)+'('+c+')'
+            pos=dfcols.index(c)
+            tt=ticker_type_list[pos]
+            ccn=ticker_name(c,tt)
             df2.rename(columns={c:ccn},inplace=True)
         
         if sortby=='tpw_mean':

siat/fama_french.py

@@ -926,7 +926,7 @@ def reg_ff3_betas(ticker,start,end,scope='US',graph=True):
     if graph == True:
         gparms=parms.iloc[[1,2,3]]
         print("\n",parms)
-        title=codetranslate(ticker)+": FF3模型的贝塔系数"
+        title=ticker_name(ticker)+": FF3模型的贝塔系数"
         plt.title(title,fontsize=12,fontweight='bold')
         plt.ylabel("贝塔系数",fontsize=12,fontweight='bold')
         
@@ -1043,7 +1043,7 @@ def reg_ffc4_betas(ticker,start,end,scope='US',graph=True):
     gparms=parms.iloc[[1,2,3,4]]
     if graph == True:
         #print("\n",parms)
-        title=codetranslate(ticker)+": FFC4模型的贝塔系数"
+        title=ticker_name(ticker)+": FFC4模型的贝塔系数"
         plt.title(title,fontsize=12,fontweight='bold')
         plt.ylabel("贝塔系数",fontsize=12,fontweight='bold')
         
@@ -1160,7 +1160,7 @@ def reg_ff5_betas(ticker,start,end,scope='US',graph=True):
     gparms=parms.iloc[[1,2,3,4,5]]
     if graph == True:
         #print("\n",parms)
-        title=codetranslate(ticker)+"：FF5模型的贝塔系数"
+        title=ticker_name(ticker)+"：FF5模型的贝塔系数"
         plt.title(title,fontsize=12,fontweight='bold')
         plt.ylabel("贝塔系数",fontsize=12,fontweight='bold')
         

siat/financials.py

@@ -179,8 +179,8 @@ def compare_history(tickers,items, \
         colname=item1
         collabel=ectranslate(item1)
         ylabeltxt=''
-        #titletxt=codetranslate(ticker1)+texttranslate(": 基于年(季)报的业绩历史")
-        titletxt=codetranslate(ticker1)+": 基于财务报表的业绩历史"
+        #titletxt=ticker_name(ticker1)+texttranslate(": 基于年(季)报的业绩历史")
+        titletxt=ticker_name(ticker1)+": 基于财务报表的业绩历史"
         #footnote=texttranslate("数据来源: 雅虎财经,")+' '+str(today)
         footnote="数据来源: 雅虎财经,"+' '+str(today)
         
@@ -203,8 +203,8 @@ def compare_history(tickers,items, \
         colname2=item2
         label2=ectranslate(item2)
         ylabeltxt=''
-        #titletxt=codetranslate(ticker1)+texttranslate(": 基于年(季)报的业绩历史对比")
-        titletxt=codetranslate(ticker1)+": 基于财务报表的业绩历史对比"
+        #titletxt=ticker_name(ticker1)+texttranslate(": 基于年(季)报的业绩历史对比")
+        titletxt=ticker_name(ticker1)+": 基于财务报表的业绩历史对比"
         #footnote=texttranslate("数据来源: 雅虎财经,")+' '+str(today)
         footnote="数据来源: 雅虎财经,"+' '+str(today)
         
@@ -241,8 +241,8 @@ def compare_history(tickers,items, \
         colname2=item2
         label2=ectranslate(item2)
         ylabeltxt=''
-        #titletxt=codetranslate(ticker1)+" vs "+codetranslate(ticker2)+texttranslate(": 基于年(季)报的业绩历史对比")
-        titletxt=codetranslate(ticker1)+" vs "+codetranslate(ticker2)+": 基于财务报表的业绩历史对比"
+        #titletxt=ticker_name(ticker1)+" vs "+ticker_name(ticker2)+texttranslate(": 基于年(季)报的业绩历史对比")
+        titletxt=ticker_name(ticker1)+" vs "+ticker_name(ticker2)+": 基于财务报表的业绩历史对比"
         #footnote=texttranslate("数据来源: 雅虎财经,")+' '+str(today)
         footnote="数据来源: 雅虎财经,"+' '+str(today)
         
@@ -382,7 +382,7 @@ def compare_snapshot(tickers,itemk, \
                 #print("  #Error(compare_snapshot): failed to get info of",item,"for",t)
                 continue
             
-        name=codetranslate(t)
+        name=ticker_name(t)
         row=pd.Series({'ticker':t,'item':item,'value':value,'name':name})
         try:
             df=df.append(row,ignore_index=True)
@@ -446,14 +446,14 @@ def compare_snapshot(tickers,itemk, \
     
     """
     if len(foundlist) > 0:
-        foundlist_names=codetranslate(foundlist)
+        foundlist_names=ticker_name(foundlist)
         print("Results:",itemk,"info found for the stocks below")
         printInLine(foundlist_names,numberPerLine=numberPerLine,leadingBlanks=2)
         printInLine(foundlist,numberPerLine=numberPerLine,leadingBlanks=2)
     """
     if (len(notfoundlist) > 0):
         print("Warning:",itemk,"info not found for the stocks below")
-        notfoundlist_names=codetranslate(notfoundlist)
+        notfoundlist_names=ticker_name(notfoundlist)
         printInLine(notfoundlist_names,numberPerLine=numberPerLine,leadingBlanks=2)
     
     return df
@@ -545,7 +545,7 @@ def compare_snapshot2(tickers,itemk,graph=True):
         name2=name1.split(',',1)[0]
         name3=name2.split('.',1)[0]
         """
-        name=codetranslate(t)
+        name=ticker_name(t)
         row=pd.Series({'ticker':t,'item':item,'value':value,'name':name})
         try:
             df=df.append(row,ignore_index=True)
@@ -610,7 +610,7 @@ def compare_tax(tickers,graph=True,axisamp=1.3,px=False):
             print("  #Warning(compare_tax): stock info not available for",t)
             continue
         df1=df0.tail(1)
-        name=codetranslate(t)
+        name=ticker_name(t)
         reportdate=df1.index[0]
         taxrate=df1['tax rate'][0]
         row=pd.Series({'ticker':t,'name':name,'date':reportdate,'tax rate':round(taxrate,3)})
@@ -712,7 +712,7 @@ def compare_igr_sgr(tickers,graph=True,axisamp=1.0,px=False):
         if igr is None or sgr is None: 
             print("  #Warning(compare_igr_sgr): stock info not available for",t)
             continue
-        name=codetranslate(t)
+        name=ticker_name(t)
         row=pd.Series({'ticker':t,'name':name,'IGR':round(igr,3),'SGR':round(sgr,3)})
         try:
             df=df.append(row,ignore_index=True)
@@ -1925,7 +1925,7 @@ def compare_dupont(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10,hatchlist=
     num=len(df['公司'])
     for i in range(num):
         code=df.loc[i,'公司']
-        df.loc[i,'公司']=codetranslate(code)
+        df.loc[i,'公司']=ticker_name(code)
     
     f,ax1 = plt.subplots(1,figsize=(10,5))
     w = 0.75
@@ -1949,7 +1949,7 @@ def compare_dupont(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10,hatchlist=
     
     tickernamelist,fstypenamelist=[],[]
     for i in range(num):
-        tickernamelist=tickernamelist+[codetranslate(tickerlist[i])]
+        tickernamelist=tickernamelist+[ticker_name(tickerlist[i])]
         if fstypelist[i]=='3M': fsname='季报'
         else: fsname='年报'
         fstypenamelist=fstypenamelist+[fsname]
@@ -1967,7 +1967,7 @@ def compare_dupont(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10,hatchlist=
         for i in range(num):
             if linenum % 4 == 3:
                 footnote=footnote+'\n'
-            footnote=footnote+codetranslate(tickerlist[i])+"："+fsdatelist[i]+"，"+fstypenamelist[i]
+            footnote=footnote+ticker_name(tickerlist[i])+"："+fsdatelist[i]+"，"+fstypenamelist[i]
             if linenum < num -1:
                 footnote=footnote+'；'
             linenum=linenum + 1

siat/financials2.py

@@ -210,7 +210,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             
             fsdf4.replace(0,'---',inplace=True)
             
-            titletxt="\n***** "+codetranslate(tickers)+": BALANCE SHEET"+' *****\n'
+            titletxt="\n***** "+ticker_name(tickers)+": BALANCE SHEET"+' *****\n'
             print(titletxt)
             """
             tablefmt_list=["plain","simple","github","grid","simple_grid","rounded_grid", \
@@ -307,7 +307,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             
             fsdf4.replace(0,'---',inplace=True)
             
-            titletxt="\n***** "+codetranslate(tickers)+": INCOME STATEMENTS"+' *****\n'
+            titletxt="\n***** "+ticker_name(tickers)+": INCOME STATEMENTS"+' *****\n'
             print(titletxt)
             
             collist=list(fsdf4)
@@ -382,7 +382,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             
             fsdf4.replace(0,'---',inplace=True)
             
-            titletxt="\n***** "+codetranslate(tickers)+": CASHFLOW STATEMENTS"+' *****\n'
+            titletxt="\n***** "+ticker_name(tickers)+": CASHFLOW STATEMENTS"+' *****\n'
             print(titletxt)
             
             collist=list(fsdf4)
@@ -488,7 +488,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 
                 fsdf4.replace(0,'---',inplace=True)
                 
-                titletxt="\n***** "+codetranslate(tickers)+": FINANCIAL STATEMENT SUMMARY"+' *****\n'
+                titletxt="\n***** "+ticker_name(tickers)+": FINANCIAL STATEMENT SUMMARY"+' *****\n'
                 print(titletxt)
                 
                 collist=list(fsdf4)
@@ -551,7 +551,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             # 变换年报/季报
             fsdf['periodType']=fsdf['periodType'].apply(lambda x: 'Annual' if x=='12M' else 'Quarterly')
             fsdf['reportDate']=fsdf['asOfDate'].apply(lambda x: x.strftime('%y-%m-%d'))
-            fsdf['Name']=fsdf['ticker'].apply(lambda x: codetranslate(x))
+            fsdf['Name']=fsdf['ticker'].apply(lambda x: ticker_name(x))
             fsdf.set_index('Name',inplace=True)
             
             fsdf.replace([np.inf, -np.inf], np.nan, inplace=True)
@@ -691,7 +691,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
                 
                 fsdf4.replace(0,'---',inplace=True)
                 
-                titletxt="\n***** "+codetranslate(tickers)+": FINANCIAL INDICATORS"+' *****\n'
+                titletxt="\n***** "+ticker_name(tickers)+": FINANCIAL INDICATORS"+' *****\n'
                 print(titletxt)
                 
                 collist=list(fsdf4)
@@ -758,7 +758,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             # 变换年报/季报
             fsdf['periodType']=fsdf['periodType'].apply(lambda x: 'Annual' if x=='12M' else 'Quarterly')
             fsdf['reportDate']=fsdf['asOfDate'].apply(lambda x: x.strftime('%y-%m-%d'))
-            fsdf['Name']=fsdf['ticker'].apply(lambda x: codetranslate(x))
+            fsdf['Name']=fsdf['ticker'].apply(lambda x: ticker_name(x))
             fsdf.set_index('Name',inplace=True)
             
             fsdf.replace([np.inf, -np.inf], np.nan, inplace=True)
@@ -856,7 +856,7 @@ def fs_analysis(tickers,fsdates=[],analysis_type='balance sheet', \
             
         # 多只股票的杜邦分析对比  
         fsdf['periodType']=fsdf['periodType'].apply(lambda x: 'Annual' if x=='12M' else 'Quarterly')
-        fsdf['Company']=fsdf['ticker'].apply(lambda x: codetranslate(x))
+        fsdf['Company']=fsdf['ticker'].apply(lambda x: ticker_name(x))
         
         
         collist=['Company','periodType','endDate','Profit Margin','Total Asset Turnover','Equity Multiplier','Return on Equity']

siat/financials_china.py

@@ -45,7 +45,7 @@ plt.rcParams['axes.unicode_minus'] = False
 import pandas as pd
 import akshare as ak
 
-STOCK_SUFFIX_CHINA=['SS','SZ','BJ','NQ']
+#STOCK_SUFFIX_CHINA=['SS','SZ','BJ','NQ']
 #==============================================================================
 #==============================================================================
 if __name__=='__main__':
@@ -729,7 +729,7 @@ def compare_dupont_china(tickerlist,fsdate='latest',scale1 = 10,scale2 = 10, \
     num=len(df['公司'])
     for i in range(num):
         code=df.loc[i,'公司']
-        df.loc[i,'公司']=codetranslate(code).replace("(A股)",'')
+        df.loc[i,'公司']=ticker_name(code).replace("(A股)",'')
     
     f,ax1 = plt.subplots(1,figsize=(10,5))
     w = 0.75
@@ -2256,12 +2256,12 @@ def cn_codetranslate(ticker):
     """
     result,prefix,suffix=split_prefix_suffix(ticker)
     if suffix in STOCK_SUFFIX_CHINA:
-        name=codetranslate(ticker)
+        name=ticker_name(ticker)
 
     if suffix =='':
         for s in STOCK_SUFFIX_CHINA:
             ticker_try=ticker+'.'+s
-            name=codetranslate(ticker_try)
+            name=ticker_name(ticker_try)
             print('\b'*99," Looking for the short name of stock",ticker)
             if not (name == ticker_try): break
         
@@ -2428,7 +2428,7 @@ def compare_history_china(tickers,items,start,end,period_type='annual', \
         #collabel=ectranslate(item1)
         collabel=colname
         ylabeltxt=''
-        titletxt=codetranslate(ticker1)+": 财务指标历史"
+        titletxt=ticker_name(ticker1)+": 财务指标历史"
         
         colmin=round(df1[colname].min(),2)
         colmax=round(df1[colname].max(),2)
@@ -2482,9 +2482,9 @@ def compare_history_china(tickers,items,start,end,period_type='annual', \
         colmin2=round(df2[colname2].min(),2)
         colmax2=round(df2[colname2].max(),2)
         colmean2=round(df2[colname2].mean(),2)
-        footnote1=codetranslate(ticker1)+"："+ \
+        footnote1=ticker_name(ticker1)+"："+ \
             str(colmin1)+" - "+str(colmax1)+"，均值"+str(colmean1)
-        footnote2=codetranslate(ticker2)+"："+ \
+        footnote2=ticker_name(ticker2)+"："+ \
             str(colmin2)+" - "+str(colmax2)+"，均值"+str(colmean2)
         footnote=footnote1+'\n'+footnote2+'\n'+footnote9
         
@@ -2571,7 +2571,7 @@ def compare_snapshot_china(tickers,itemk,endDate='latest',datatag=True,tag_offse
         t=rdf['ticker'].values[0]
         item=cols[1]
         value=rdf[item].values[0]
-        name=codetranslate(t)
+        name=ticker_name(t)
         if name == t:
             name=rdf[cols[2]].values[0]
         row=pd.Series({'ticker':t,'item':item,'value':value,'name':name})
@@ -2656,7 +2656,7 @@ def compare_tax_china(tickers,endDate='latest',datatag=True,tag_offset=0.01,grap
             print("  #Error(compare_tax_china): failed to get financial info for",t)
             continue
         df1=df0.tail(1)
-        name=codetranslate(t)
+        name=ticker_name(t)
         reportdate=df1.index[0]
         taxrate=df1['tax rate'][0]
         row=pd.Series({'ticker':t,'name':name,'date':reportdate,'tax rate%':round(taxrate*100,2)})
@@ -2755,7 +2755,7 @@ def compare_igr_sgr_china(tickers,endDate='latest',graph=True,axisamp1=1.3,axisa
         if igr is None or sgr is None: 
             print("  #Warning(compare_igr_sgr_china): no stock info found for",t)
             continue
-        name=codetranslate(t)
+        name=ticker_name(t)
         row=pd.Series({'ticker':t,'name':name,'IGR%':round(igr*100,2),'SGR%':round(sgr*100,2)})
         try:
             df=df.append(row,ignore_index=True)
@@ -2830,7 +2830,7 @@ def dupont_decompose_china(ticker,fsdate,gview=False):
     #亿元
     yi=100000000
 
-    company_name=codetranslate(ticker)
+    company_name=ticker_name(ticker)
     # 定义杜邦分解项目变量
     
     roe='【'+company_name+'】\n('+fsdate+')\n'+'净资产收益率'
@@ -3213,7 +3213,7 @@ def dupont_decompose_china(ticker,fsdate,gview=False):
     
     from graphviz import Digraph
     #按各公司的层数生产分层的节点：
-    g=Digraph(name=codetranslate(ticker)+fsdate)
+    g=Digraph(name=ticker_name(ticker)+fsdate)
     
     for key in dic:
         for n in range(number_of_layers+1):
@@ -3238,7 +3238,7 @@ def dupont_decompose_china(ticker,fsdate,gview=False):
     
     #打印信息
     if not gview:
-        print("\n注:",codetranslate(ticker),"\b，金额单位：亿元，财报日期:",fsdate)
+        print("\n注:",ticker_name(ticker),"\b，金额单位：亿元，财报日期:",fsdate)
         print("1、为避免图示过大，这里未列出所有分解项目")
         print("2、金融机构报表与普通企业结构不同，此处仅为约算")
         print("3、应收款项包括应收账款、应收利息、应收保费以及应收票据等")
@@ -3411,7 +3411,7 @@ def get_fin_summary_1ticker_china(ticker,fsdates):
     try:
         dft2=dft[['选项','指标']+fsdates3]
     except:
-        print("  #Warning(get_fin_summary_1ticker_china): fin stmt of",fsdates3[0],"unavailable for",ticker+'('+codetranslate(ticker)+')')
+        print("  #Warning(get_fin_summary_1ticker_china): fin stmt of",fsdates3[0],"unavailable for",ticker+'('+ticker_name(ticker)+')')
         return None
     
     # 金额变换：元-->亿元，小数位截取
@@ -3689,7 +3689,7 @@ def compare_fin_summary_china(tickers,fsdates):
     # 一只股票情形：多日期
     if len(tickers_found) == 1:
         ticker1=tickers[0]
-        titletxt="\n===== 上市公司财务报表摘要："+codetranslate(ticker1)+" ====="    
+        titletxt="\n===== 上市公司财务报表摘要："+ticker_name(ticker1)+" ====="    
         print(titletxt)    
         
         fsdf1=fsdf[fsdf['ticker']==ticker1]
@@ -3730,7 +3730,7 @@ def compare_fin_summary_china(tickers,fsdates):
             
             try:
                 dft2=dft[['选项','指标',fsdates3[0]]]
-                dft2.rename(columns={fsdates3[0]:codetranslate(t)},inplace=True)
+                dft2.rename(columns={fsdates3[0]:ticker_name(t)},inplace=True)
             except:
                 print("  #Error(compare_fin_summary_china): fin stmt of",t,'not found on',fsdates3[0])
                 return None
@@ -3797,9 +3797,9 @@ def get_fin_indicator_1ticker_china(ticker,fsdates):
     fsdate_field=list(dft)[0]
     dft2=dft[dft[fsdate_field].isin(fsdates3)]
     if len(dft2) < len(fsdates3):
-        print("  #Warning(get_fin_summary_1ticker_china): fin stmt of some dates unavailable for",ticker+'('+codetranslate(ticker)+')')
+        print("  #Warning(get_fin_summary_1ticker_china): fin stmt of some dates unavailable for",ticker+'('+ticker_name(ticker)+')')
     if len(dft2) ==0:
-        print("  #Error(get_fin_summary_1ticker_china): no fin stmts found for",ticker+'('+codetranslate(ticker)+') on',fsdates)
+        print("  #Error(get_fin_summary_1ticker_china): no fin stmts found for",ticker+'('+ticker_name(ticker)+') on',fsdates)
         return None
 
     # 去掉重复行
@@ -4171,7 +4171,7 @@ def compare_fin_indicator_china(tickers,fsdates):
     # 一只股票情形：多日期
     if len(tickers_found) == 1:
         ticker1=tickers[0]
-        titletxt="\n===== 上市公司主要财务比率和重要指标："+codetranslate(ticker1)+" ====="    
+        titletxt="\n===== 上市公司主要财务比率和重要指标："+ticker_name(ticker1)+" ====="    
         print(titletxt)    
         
         fsdf1=fsdf[fsdf['ticker']==ticker1]
@@ -4227,7 +4227,7 @@ def compare_fin_indicator_china(tickers,fsdates):
             
             try:
                 dft2=dft[['选项','指标',fsdates3[0]]]
-                dft2.rename(columns={fsdates3[0]:codetranslate(t)},inplace=True)
+                dft2.rename(columns={fsdates3[0]:ticker_name(t)},inplace=True)
             except:
                 print("  #Error(compare_fin_summary_china): fin stmt of",fsdates3[0],'not found for',t)
                 return None