X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=functions.py;h=733eff91fbe41f797be4981a0a7483a896d79fef;hp=f2b57df94923c5e82df69d89cec5ede64eb692a0;hb=6f825cfc9779c3fee81ea608b3a4972259d157e1;hpb=8e68628ab2d388b0a60350be5f5ceca505fbfa8a

diff --git a/functions.py b/functions.py
index f2b57df..733eff9 100644
--- a/functions.py
+++ b/functions.py
@@ -429,7 +429,7 @@ def BugReport(parent, error = None):
                 txt = exc
         else :
             if exc in exceptions :
-                txt = exceptions[mss]
+                txt = exceptions[exc]
             else :
                 txt = exc
         title = "Information"
@@ -468,7 +468,7 @@ def ReadDicoAsDico(dicopath):
     dico = {}
     for line in content :
         if line[0] != u'':
-            line = line.replace(u'\n', '').replace('"', '').split('\t')
+            line = line.rstrip('\n\r').replace(u'\n', '').replace('"', '').split('\t')
             dico[line[0]] = line[1:]
     return dico
 
@@ -533,13 +533,13 @@ def exec_rcode(rpath, rcode, wait = True, graph = False):
             if sys.platform == 'win32':
                 error = call(["%s" % rpath, "--vanilla","--slave","-f", "%s" % rcode])
             else :
-                error = call([rpath, '--vanilla','--slave',"-f %s" % rcode])
+                error = call([rpath, '--vanilla','--slave',"-f %s" % rcode, "--encoding=UTF-8"])
             return error
         else :
             if sys.platform == 'win32':
                 pid = Popen(["%s" % rpath, '--vanilla','--slave','-f', "%s" % rcode])
             else :
-                pid = Popen([rpath, '--vanilla','--slave',"-f %s" % rcode], stderr = PIPE)
+                pid = Popen([rpath, '--vanilla','--slave',"-f %s" % rcode, "--encoding=UTF-8"], stderr = PIPE)
             return pid
     else :
         if wait :
@@ -547,18 +547,18 @@ def exec_rcode(rpath, rcode, wait = True, graph = False):
                 error = call(["%s" % rpath, '--vanilla','--slave','-f', "%s" % rcode])
             elif sys.platform == 'darwin' and needX11:
                 os.environ['DISPLAY'] = ':0.0'
-                error = call([rpath, '--vanilla','--slave',"-f %s" % rcode])
+                error = call([rpath, '--vanilla','--slave',"-f %s" % rcode, "--encoding=UTF-8"])
             else :
-                error = call([rpath, '--vanilla','--slave',"-f %s" % rcode])
+                error = call([rpath, '--vanilla','--slave',"-f %s" % rcode, "--encoding=UTF-8"])
             return error
         else :
             if sys.platform == 'win32':
                 pid = Popen(["%s" % rpath, '--vanilla','--slave','-f', "%s" % rcode])
             elif sys.platform == 'darwin' and needX11:
                 os.environ['DISPLAY'] = ':0.0'
-                pid = Popen([rpath, '--vanilla','--slave',"-f %s" % rcode], stderr = PIPE)
+                pid = Popen([rpath, '--vanilla','--slave',"-f %s" % rcode, "--encoding=UTF-8"], stderr = PIPE)
             else :
-                pid = Popen([rpath, '--vanilla','--slave',"-f %s" % rcode], stderr = PIPE)
+                pid = Popen([rpath, '--vanilla','--slave',"-f %s" % rcode, "--encoding=UTF-8"], stderr = PIPE)
             return pid
 
 def check_Rresult(parent, pid) :