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
SSHLauncher tweaks #2270
Conversation
Test results for commit 177248f merged into master (fb439f4)
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)) |
There was a problem hiding this comment.
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...
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
OK, with the rebase and discussion, this is good to go. Thanks!! Merging now. |
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.
* 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
* 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
* 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) ...
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.
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.