X-Git-Url: http://iramuteq.org/git?a=blobdiff_plain;f=layout.py;h=d437c4b8d17618ccf8f6d87ce3cd423f5b9955ae;hb=82dde3ff5f415750e7968fcacf8b0b7d18d2ce53;hp=2f8d985c87ac2ccb761e22d62f9dadafa678920b;hpb=eaa044d1147e26b82942ce56d5965c83fdddf069;p=iramuteq diff --git a/layout.py b/layout.py index 2f8d985..d437c4b 100644 --- a/layout.py +++ b/layout.py @@ -693,7 +693,7 @@ class TgenLayout : ira = wx.GetApp().GetTopWindow() tgenpath = os.path.join(parametres['pathout'], 'tgen.csv') self.page.tgens, etoiles = ReadList(parametres['tgenspec'], ira.syscoding, sep="\t") - tgen = TGen(path = tgenpath, encoding = parametres['encoding']) + tgen = TGen(path = tgenpath, encoding = 'UTF-8') tgen.read() tgenlempath = os.path.join(parametres['pathout'], 'tgenlemchi2.csv') if os.path.exists(tgenlempath) : @@ -823,10 +823,10 @@ class StatLayout: lcle = {'total' :'total.csv', 'formes_actives':'formes_actives.csv', 'formes_supplémentaires':'formes_supplémentaires.csv', 'hapax': 'hapax.csv'} self.result = {} for key in lcle : - with codecs.open(self.pathout[lcle[key]], 'r', sys.getdefaultencoding()) as f : + with open(self.pathout[lcle[key]], 'r', encoding='utf-8') as f : self.result[key] = [line.split(';') for line in f.read().splitlines()] self.result[key] = dict([[i,[line[0],int(line[1]), line[2]]] for i, line in enumerate(self.result[key])]) - with open(self.pathout['glob.txt'], 'r') as f : + with open(self.pathout['glob.txt'], 'r', encoding='utf-8') as f : self.result['glob'] = f.read()