From f698e96172bbd8951838f10bdd55ee7ecf1b209d 2014-12-05 01:48:49
From: Thomas Kluyver <takowl@gmail.com>
Date: 2014-12-05 01:48:49
Subject: [PATCH] Get rid of address property on channels
---
diff --git a/IPython/kernel/blocking/channels.py b/IPython/kernel/blocking/channels.py
index 6d022e7..7ff0b3d 100644
--- a/IPython/kernel/blocking/channels.py
+++ b/IPython/kernel/blocking/channels.py
@@ -44,7 +44,7 @@ def validate_string_dict(dct):
class ZMQSocketChannel(object):
- """The base class for the channels that use ZMQ sockets."""
+ """A ZMQ socket in a simple blocking API"""
session = None
socket = None
stream = None
@@ -113,14 +113,6 @@ class ZMQSocketChannel(object):
def is_alive(self):
return (self.socket is not None)
- @property
- def address(self):
- """Get the channel's address as a zmq url string.
-
- These URLS have the form: 'tcp://127.0.0.1:5555'.
- """
- return self._address
-
def _queue_send(self, msg):
"""Pass a message to the ZMQ socket to send
"""
diff --git a/IPython/qt/client.py b/IPython/qt/client.py
index b424d64..b1bf7f7 100644
--- a/IPython/qt/client.py
+++ b/IPython/qt/client.py
@@ -54,7 +54,7 @@ def validate_string_dict(dct):
class QtZMQSocketChannel(SuperQObject):
- """The base class for the channels that use ZMQ sockets."""
+ """A ZMQ socket emitting a Qt signal when a message is received."""
session = None
socket = None
ioloop = None
@@ -116,14 +116,6 @@ class QtZMQSocketChannel(SuperQObject):
pass
self.socket = None
- @property
- def address(self):
- """Get the channel's address as a zmq url string.
-
- These URLS have the form: 'tcp://127.0.0.1:5555'.
- """
- return self._address
-
def _queue_send(self, msg):
"""Queue a message to be sent from the IOLoop's thread.