daily merge

Author: lunbixiaozi

19100303/lunbixiaozi/mymodule/main.py

@@ -1,7 +1,9 @@
 import stats_word
 import re
 
-text = '''
+text = 5
+
+'''
 愚公移山
 太行，王屋二山的北面，住了一個九十歲的老翁，名叫愚公。二山佔地廣闊，擋住去路，使他和家人往來極為不便。
 一天，愚公召集家人說：「讓我們各盡其力，剷平二山，開條道路，直通豫州，你們認為怎樣？」
@@ -33,6 +35,10 @@
 Filled with admiration for Yugong, the Emperor of Heavens ordered two mighty gods to carry the mountains away.
 '''
 
+try:
+    stats_word.stats_text(text)
+except:
+    print("Main program parameter type error: TypeError catched!")
 
-stats_word.stats_text(text)
+    
 

19100303/lunbixiaozi/mymodule/stats_word.py

@@ -37,65 +37,77 @@
 '''
 
 def stats_text_en (text): #sort English words by the frequency.
+    try:
+        for i in range(len(text)):
+            if (text[i] >= u'\u0041' and text[i]<=u'\u005a') or (text[i] >= u'\u0061' and text[i]<=u'\u007a'):
+                break
 
-    for i in range(len(text)):
-        if (text[i] >= u'\u0041' and text[i]<=u'\u005a') or (text[i] >= u'\u0061' and text[i]<=u'\u007a'):
-            break
 
+        text_en = text[i:]
+        text_en = text_en.replace('--', '')
+        text_en = text_en.replace('!', '')
+        text_en = text_en.replace('*', '')
+        text_en = text_en.replace('.', ' ')
+        text_en = text_en.replace(',', '')
 
-    text_en = text[i:]
-    text_en = text_en.replace('--', '')
-    text_en = text_en.replace('!', '')
-    text_en = text_en.replace('*', '')
-    text_en = text_en.replace('.', ' ')
-    text_en = text_en.replace(',', '')
+        # print("CN words frequency: ")
+        # print(text_en)
 
-    # print("CN words frequency: ")
-    # print(text_en)
+        text_en = text_en.split()
 
-    text_en = text_en.split()
+        counter_en = collections.Counter(text_en)
+        print("\n\nEN words frequency: ")
+        print(counter_en)
 
-    counter_en = collections.Counter(text_en)
-    print("\n\nEN words frequency: ")
-    print(counter_en)
+        return counter_en
 
-    return counter_en
+    except TypeError:
+        print("English sorting: TypeError catched!")
+        
+
+    
 
 
 
 
 def stats_text_cn (text): #sort Chinese words by the frequency.
-    text_cn = ''
+    try:
+        text_cn = ''
 
-    for ch in text:
-        if u'\u4e00' <= ch <= u'\u9fff': #only fetch the Chinese characthers
-            text_cn = text_cn + ch
+        for ch in text:
+            if u'\u4e00' <= ch <= u'\u9fff': #only fetch the Chinese characthers
+                text_cn = text_cn + ch
 
 
-    # text = text.replace('：', '')
-    # text = text.replace('，', '')
-    # text = text.replace('\n', '')
-    #text = text.replace('*', '')
-    #print ('first char:')
-    #print (text[0])
+        # text = text.replace('：', '')
+        # text = text.replace('，', '')
+        # text = text.replace('\n', '')
+        #text = text.replace('*', '')
+        #print ('first char:')
+        #print (text[0])
 
-    text_split = []
+        text_split = []
 
-    for i in range(len(text_cn)):
-        text_split.append(text_cn[i])
+        for i in range(len(text_cn)):
+            text_split.append(text_cn[i])
 
-    #text = text.split()
 
-    counter_cn = collections.Counter(text_split)
-    print("CN wrods frequency: ")
-    print(counter_cn)
-    return counter_cn
+        counter_cn = collections.Counter(text_split)
+        print("CN wrods frequency: ")
+        print(counter_cn)
+        return counter_cn
+    
+    except TypeError:
+        print("Chinese sorting: TypeError catched!")
 
-#print(stats_text_cn(text_cn))
 
 
 def stats_text (text): #call the functions above
+
+    try:        
+        stats_text_cn (text)
+        stats_text_en (text)
+    except TypeError:
+        print("Text sorting: TypeError catched!")
 
-    stats_text_cn (text)
-    stats_text_en (text)