Skip to content
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.

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

SSHLauncher tweaks #2270

Merged
merged 2 commits into from Aug 9, 2012
Merged

SSHLauncher tweaks #2270

merged 2 commits into from Aug 9, 2012

Conversation

minrk
Copy link
Member

@minrk minrk commented Aug 8, 2012

  • use pipes.quote on SSH commands
  • default SSHEngineSetLauncher to ipengine instead of import-based command.

This is actually the intended behavior, and only brings EngineSet inline with SSHEngine and SSHController, which both use the simplified command.

@fperez
Copy link
Member

fperez commented Aug 9, 2012

Test results for commit 177248f merged into master (fb439f4)
Platform: linux2

  • python2.7: OK
  • python3.2: OK (libraries not available: cython matplotlib oct2py pygments pymongo rpy2 wx wx.aui)

Not available for testing: python2.6

@@ -584,7 +584,7 @@ def _user_changed(self, name, old, new):

def find_args(self):
return self.ssh_cmd + self.ssh_args + [self.location] + \
self.program + self.program_args
list(map(pipes.quote, self.program + self.program_args))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the explicit call to list here? map always returns a list, so I'm not sure why you need this one...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Habits from fighting against Python 3. I don't know if 2to3 always takes care of the list(map), since map returns a generator, and list + map is illegal in py3.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, let's leave it... Might as well start getting into a py3 mindset, sooner or later we'll be moving over.

they need double-quoting for some reason, when passing through SSH.
SSHEngineLauncher and SSHControllerLauncher already had this value set,
but it was missed in SSHEngineSetLauncher, which usually overrides SSHEngineLauncher.
@fperez
Copy link
Member

fperez commented Aug 9, 2012

OK, with the rebase and discussion, this is good to go. Thanks!! Merging now.

fperez added a commit that referenced this pull request Aug 9, 2012
SSHLauncher tweaks

* use pipes.quote on SSH commands
* default SSHEngineSetLauncher to `ipengine` instead of import-based command.

This is actually the intended behavior, and only brings EngineSet inline with SSHEngine and SSHController, which both use the simplified command.
@fperez fperez merged commit 17840b9 into ipython:master Aug 9, 2012
minrk added a commit that referenced this pull request Aug 9, 2012
* use pipes.quote on SSH commands
* default SSHEngineSetLauncher to `ipengine` instead of import-based command.

This is actually the intended behavior, and only brings EngineSet inline with SSHEngine and SSHController, which both use the simplified command.

* Should be backported to 0.13.1
* Must be not be merged before #2269
minrk added a commit that referenced this pull request Sep 1, 2012
* use pipes.quote on SSH commands
* default SSHEngineSetLauncher to `ipengine` instead of import-based command.

This is actually the intended behavior, and only brings EngineSet inline with SSHEngine and SSHController, which both use the simplified command.

* Should be backported to 0.13.1
* Must be not be merged before #2269
@minrk minrk deleted the sshlaunchers branch March 31, 2014 23:36
yarikoptic added a commit to yarikoptic/ipython that referenced this pull request May 2, 2014
* commit 'rel-0.13-33-gcfc5692': (33 commits)
  Backport PR ipython#2347: adjust division error message checking to account for Python 3
  Backport PR ipython#2305: RemoteError._render_traceback_ calls self.render_traceback
  Backport PR ipython#2280: fix SSH passwordless check for OpenSSH
  Backport PR ipython#2270: SSHLauncher tweaks
  Backport PR ipython#2261: Fix: longest_substr([]) -> ''
  Backport PR ipython#2250: fix html in notebook example
  Backport PR ipython#2235: remove spurious print statement from setupbase.py
  fixup
  Backport PR ipython#2223: Custom tracebacks
  Backport PR ipython#2214: use KernelApp.exec_lines/files in IPEngineApp
  Backport PR ipython#2212: catch errors in markdown javascript
  Backport PR ipython#2194: clean nan/inf in json_clean
  Backport PR ipython#2177: remove numpy install from travis/tox scripts
  Backport PR ipython#2169: ipdb: pdef, pdoc, pinfo magics all broken
  Backport PR ipython#2186: removed references to h5py dependence in octave magic documentation
  Backport PR ipython#2185: added test for %store, fixed storemagic
  Backport PR ipython#2170: Fix tab completion with IPython.embed_kernel().
  Backport PR ipython#2163: fix 'remote_profie_dir' typo in SSH launchers
  Backport PR ipython#2117: use explicit url in notebook example
  Backport PR ipython#2126: ipcluster broken with any batch (PBS/LSF/SGE)
  ...
mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
SSHLauncher tweaks

* use pipes.quote on SSH commands
* default SSHEngineSetLauncher to `ipengine` instead of import-based command.

This is actually the intended behavior, and only brings EngineSet inline with SSHEngine and SSHController, which both use the simplified command.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants