Skip to content
Browse files

expose --transport

  • Loading branch information...
1 parent 38c31f8 commit 19a213572a3b44a8762abb47b741e566439ab2d2 @minrk committed Jan 14, 2013
Showing with 2 additions and 2 deletions.
  1. +1 −1 IPython/frontend/consoleapp.py
  2. +1 −1 IPython/zmq/heartbeat.py
View
2 IPython/frontend/consoleapp.py
@@ -88,6 +88,7 @@
# also scrub aliases from the frontend
app_aliases = dict(
+ transport = 'IPythonConsoleApp.transport',
hb = 'IPythonConsoleApp.hb_port',
shell = 'IPythonConsoleApp.shell_port',
iopub = 'IPythonConsoleApp.iopub_port',
@@ -96,7 +97,6 @@
existing = 'IPythonConsoleApp.existing',
f = 'IPythonConsoleApp.connection_file',
-
ssh = 'IPythonConsoleApp.sshserver',
)
aliases.update(app_aliases)
View
2 IPython/zmq/heartbeat.py
@@ -41,7 +41,7 @@ def __init__(self, context, addr=('tcp', LOCALHOST, 0)):
self.port = s.getsockname()[1]
s.close()
elif addr[0] == 'ipc':
- while os.path.exists(self.ip + '-' + self.port):
+ while os.path.exists("%s-%s" % (self.ip, self.port)):
self.port = self.port + 1
else:
raise ValueError("Unrecognized zmq transport: %s" % addr[0])

0 comments on commit 19a2135

Please sign in to comment.
Something went wrong with that request. Please try again.