Merge branch 'develop'

Author: cdfarrow

.gitignore

@@ -3,6 +3,7 @@ FlexTools/Modules-*
 FlexTools/Collections-*
 
 flextools.ini
+FlexTools/Collections/*
 
 # Temp files
 *.tmp

FlexTools/Collections/Chinese processors.ini

@@ -1,9 +1,6 @@
 [Chinese.Update Tone Number Fields]
-_order = 1
 
 [Chinese.Update Pinyin Fields]
-_order = 2
 
 [Chinese.Update Reversal Index Sort Field]
-_order = 3
 

FlexTools/Collections/Duplicates.ini

@@ -1,12 +1,8 @@
 [Duplicates.Find Duplicate Definitions]
-_order = 1
 
 [Duplicates.Find Duplicate Entries]
-_order = 2
 
 [Duplicates.Merge Entries]
-_order = 3
 
 [Duplicates.Merge Senses]
-_order = 4
 

FlexTools/Collections/Examples.ini

@@ -1,20 +1,14 @@
 [Reports.Project Information]
-_order = 1
 
 [Reports.Text Statistics]
-_order = 2
 
 [Reports.Lexicon Statistics]
-_order = 3
 
 [Utilities.Approve Spelling of Numbers]
-_order = 4
 
 [Reports.Lexeme Usage in Corpus]
-_order = 5
 
 [Examples.Example - Check Punctuation]
-_order = 6
 
 [Export.Dump All Headwords To File]
-_order = 7
+

FlexTools/Collections/Exporters.ini

@@ -1,12 +1,8 @@
-[Export.Dump All Headwords To File]
-_order = 1
+[Export.Export All Headwords To File]
 
-[Export.Dump Published Headwords To File]
-_order = 2
+[Export.Export Published Headwords To File]
 
-[Export.Dump Semantic Domain List To File]
-_order = 3
+[Export.Export Semantic Domain List To File]
 
-[Export.Dump Texts To File]
-_order = 4
+[Export.Export Texts To File]
 

FlexTools/Collections/Reports.ini

@@ -1,11 +1,8 @@
 [Reports.Project Information]
-_order = 1
 
 [Reports.Lexeme Usage in Corpus]
-_order = 2
 
 [Reports.Text Statistics]
-_order = 3
 
 [Reports.Incomplete Analyses]
-_order = 4
+

FlexTools/Modules/Chinese/Lib/ChineseUtilities.py

@@ -9,12 +9,6 @@
 #
 #
 
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import absolute_import
-
-from builtins import str
-
 import codecs
 import re
 
@@ -232,17 +226,10 @@ def __loadPunctuation(self):
             self[c] = {l: l}            # Sort string is itself for punctuation
 
     def __load(self):
-        # This stack-frame code is all that I've found to work for
-        # getting the current path from Idle, command-line AND
-        # FlexTools (where it is used by a custom-imported module.)
-        # (Use of __file__ failed for Idle)
-        mypath = os.path.dirname(sys._getframe().f_code.co_filename)
-        fname = os.path.join(mypath, self.FileName)
-
-        if fname[-4:] == ".pkl":
-            self.__loadFromPickle(fname)
+        if self.FileName.endswith(".pkl"):
+            self.__loadFromPickle(self.FileName)
         else:
-            self.__loadFromTextFile(fname)
+            self.__loadFromTextFile(self.FileName)
         self.__loadPunctuation()
 
     def Lookup(self, hz, py):
@@ -307,71 +294,3 @@ def CalculateSortString(self, hanzi, tonenum, sortString):
 
         return (newSortString, msg)
 
-
-# --- Testing ---
-
-if __name__ == "__main__":
-    if sys.stdout.encoding == None:
-        sys.stdout = codecs.getwriter("utf-8")(sys.stdout)
-
-    testSet = [
-               ("路", "lu4"),
-               ("你好", "ni3 hao3"),
-               ("中国", "zhong1 guo4"),    # Purposeful pinyin error
-               ("中国话", "Zhong1guo2hua4"),
-               ("去人民公园",""),
-               ('枣红色',     "zao3hong2 se4"),   # Ambiguous parse
-               ("录音",      "lu4yin1"),
-               ("录音机",    "lu4yin1"),    # Purposeful pinyin error
-               ("绿",       "lu:4"),        # Multiple pronunciations
-               ("乱",       "luan4"),
-               ("耳朵",      "er3.duo5"),
-               ("孩子",      "hai2.zi5"),
-               ("撒谎",      "sa1//huang3"),
-               ("老老实实地","lao3lao5shi2shi2 .de5"),
-
-               # er hua is handled
-               ('\u5ea7\u513f', 'zuor4'),
-               ('\u53ed\u513f\u72d7', 'bar1gou3'),
-               ('\u767d\u773c\u513f\u72fc', 'bai2yanr3lang2'),
-               # Latin letters
-               ('\u5361\u62c9OK', 'ka3la1ou1kei4'),
-
-               # Fails PY check because the combination of ambiguous pinyin
-               # is checked by check_pinyin.check_pinyin() and that
-               # function doesn't handle punctuation
-               ("你好吗\N{FULLWIDTH QUESTION MARK}", "ni3 hao3 .ma5?"),
-               ('是（1单）', "shi4 ( 1 dan)"),
-
-               # This is okay
-               ("你在\N{FULLWIDTH QUESTION MARK}", "ni3 zai4?"),
-               # Other punctuation is supported
-               ('老（人）', "lao3 (ren2)"),
-               ('他，她，它', 'ta1, ta1, ta1'),
-               ('他/她/它', 'ta1/ta1/ta1'),
-               ('1单数', "1 dan1shu4"),
-               ('左…右…', 'zuo3…you4…'),
-               ('\N{FULLWIDTH SEMICOLON}', ';'),
-               ('连\N{HORIZONTAL ELLIPSIS}也', 'lian2…ye3'),
-
-               # Passes PY check, but fails Sort String due to angle brackets
-               # not being included in chin_utils.tonenum_syl_pat
-               ('\N{LEFT DOUBLE ANGLE BRACKET}做\N{RIGHT DOUBLE ANGLE BRACKET}', "<<zuo4>>"),
-
-               # Ambiguities
-               ('红',       "gong1|hong2"),
-               ]
-
-
-    print("--- Testing Chinese Parser and Sort String Generator ---")
-    Parser = ChineseParser()
-    Sorter = SortStringDB()
-    for chns, tonenum in testSet:
-        print("%s [%s] %s" % (chns, repr(chns), tonenum))
-        #print "\tParse:\t", Parser.Tonenum(chns, tonenum)
-        #if tonenum:
-        print("\tCheck:\t", tonenum)
-        result = Parser.Tonenum(chns, tonenum)
-        print("\t\t", result if result else "OK")
-        ss = Sorter.SortString(chns, tonenum)
-        print("\tSort:\t", ss)