Skip to content

Discard master and slave jargon #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bopopescu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Discard master and slave jargon #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/phenoman-src-1.0rc/pheno_man/pheno_man.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,7 +1253,7 @@ def codeR(self, dat):

def R(self, rstr):
''' Run R command and parse the output '''
tc = Popen(["R", '--slave', '--vanilla'], stdin = PIPE, stdout = PIPE, stderr = PIPE)
tc = Popen(["R", '--subordinate', '--vanilla'], stdin = PIPE, stdout = PIPE, stderr = PIPE)
out, error = tc.communicate(rstr.encode(sys.getdefaultencoding()))
if (tc.returncode):
raise ValueError(" (exception captured from R) \n{0}".format(error.decode(sys.getdefaultencoding())))
Expand Down
2 changes: 1 addition & 1 deletion src/phenoman-src-1.0rc/pheno_man/str4r.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def runR(maer):
warnings = None
if not isinstance(maer, basestring):
raise ValueError("Input script must be a string")
tc = Popen(["R", '--slave', '--vanilla'], stdin = PIPE, stdout = PIPE, stderr = PIPE)
tc = Popen(["R", '--subordinate', '--vanilla'], stdin = PIPE, stdout = PIPE, stderr = PIPE)
out, error = tc.communicate(maer.encode(sys.getdefaultencoding()))
if (tc.returncode):
raise ValueError("**** R ERROR ****\n{}*****************\n".format(error.decode(sys.getdefaultencoding())))
Expand Down