projects
/
iramuteq
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1fbb2fc
)
from mac : encoding in R
author
pierre
<pierre@MacBook-Pro-de-pierre-ratinaud.local>
Sat, 9 Feb 2013 16:04:47 +0000
(17:04 +0100)
committer
pierre
<pierre@MacBook-Pro-de-pierre-ratinaud.local>
Sat, 9 Feb 2013 16:04:47 +0000
(17:04 +0100)
functions.py
patch
|
blob
|
history
diff --git
a/functions.py
b/functions.py
index
679e6d4
..
8f15198
100644
(file)
--- a/
functions.py
+++ b/
functions.py
@@
-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 :
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 :
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 :
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(["%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 :
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'
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 :
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) :
return pid
def check_Rresult(parent, pid) :