1 files changed, 46 insertions, 43 deletions
diff --git a/gnuradio-runtime/python/gnuradio/gr/pubsub.py b/gnuradio-runtime/python/gnuradio/gr/pubsub.py
index 90568418fc..25108b8f70 100644
--- a/gnuradio-runtime/python/gnuradio/gr/pubsub.py
+++ b/gnuradio-runtime/python/gnuradio/gr/pubsub.py
@@ -26,43 +26,46 @@ Abstract GNU Radio publisher/subscriber interface
 This is a proof of concept implementation, will likely change significantly.
 """
 
+from __future__ import print_function
+from __future__ import unicode_literals
+
 class pubsub(dict):
     def __init__(self):
-	self._publishers = { }
-	self._subscribers = { }
-	self._proxies = { }
+        self._publishers = { }
+        self._subscribers = { }
+        self._proxies = { }
 
     def __missing__(self, key, value=None):
-	dict.__setitem__(self, key, value)
-	self._publishers[key] = None
-	self._subscribers[key] = []
-	self._proxies[key] = None
+        dict.__setitem__(self, key, value)
+        self._publishers[key] = None
+        self._subscribers[key] = []
+        self._proxies[key] = None
 
     def __setitem__(self, key, val):
-	if not self.has_key(key):
-	    self.__missing__(key, val)
-	elif self._proxies[key] is not None:
-	    (p, newkey) = self._proxies[key]
-	    p[newkey] = val
-	else:
-	    dict.__setitem__(self, key, val)
-	for sub in self._subscribers[key]:
-	    # Note this means subscribers will get called in the thread
-	    # context of the 'set' caller.
-	    sub(val)
+        if key not in self:
+            self.__missing__(key, val)
+        elif self._proxies[key] is not None:
+            (p, newkey) = self._proxies[key]
+            p[newkey] = val
+        else:
+            dict.__setitem__(self, key, val)
+        for sub in self._subscribers[key]:
+            # Note this means subscribers will get called in the thread
+            # context of the 'set' caller.
+            sub(val)
 
     def __getitem__(self, key):
-	if not self.has_key(key): self.__missing__(key)
-	if self._proxies[key] is not None:
-	    (p, newkey) = self._proxies[key]
-	    return p[newkey]
-	elif self._publishers[key] is not None:
-	    return self._publishers[key]()
-	else:
-	    return dict.__getitem__(self, key)
+        if key not in self: self.__missing__(key)
+        if self._proxies[key] is not None:
+            (p, newkey) = self._proxies[key]
+            return p[newkey]
+        elif self._publishers[key] is not None:
+            return self._publishers[key]()
+        else:
+            return dict.__getitem__(self, key)
 
     def publish(self, key, publisher):
-	if not self.has_key(key): self.__missing__(key)
+        if key not in self: self.__missing__(key)
         if self._proxies[key] is not None:
             (p, newkey) = self._proxies[key]
             p.publish(newkey, publisher)
@@ -70,7 +73,7 @@ class pubsub(dict):
             self._publishers[key] = publisher
 
     def subscribe(self, key, subscriber):
-	if not self.has_key(key): self.__missing__(key)
+        if key not in self: self.__missing__(key)
         if self._proxies[key] is not None:
             (p, newkey) = self._proxies[key]
             p.subscribe(newkey, subscriber)
@@ -92,9 +95,9 @@ class pubsub(dict):
             self._subscribers[key].remove(subscriber)
 
     def proxy(self, key, p, newkey=None):
-	if not self.has_key(key): self.__missing__(key)
-	if newkey is None: newkey = key
-	self._proxies[key] = (p, newkey)
+        if key not in self: self.__missing__(key)
+        if newkey is None: newkey = key
+        self._proxies[key] = (p, newkey)
 
     def unproxy(self, key):
         self._proxies[key] = None
@@ -105,49 +108,49 @@ if __name__ == "__main__":
     o = pubsub()
 
     # Non-existent key gets auto-created with None value
-    print "Auto-created key 'foo' value:", o['foo']
+    print("Auto-created key 'foo' value:", o['foo'])
 
     # Add some subscribers
     # First is a bare function
     def print_len(x):
-	print "len=%i" % (len(x), )
+        print("len=%i" % (len(x), ))
     o.subscribe('foo', print_len)
 
     # The second is a class member function
     class subber(object):
-	def __init__(self, param):
-	    self._param = param
-	def printer(self, x):
-	    print self._param, `x`
+        def __init__(self, param):
+            self._param = param
+        def printer(self, x):
+            print(self._param, repr(x))
     s = subber('param')
     o.subscribe('foo', s.printer)
 
     # The third is a lambda function
-    o.subscribe('foo', lambda x: sys.stdout.write('val='+`x`+'\n'))
+    o.subscribe('foo', lambda x: sys.stdout.write('val='+repr(x)+'\n'))
 
     # Update key 'foo', will notify subscribers
-    print "Updating 'foo' with three subscribers:"
+    print("Updating 'foo' with three subscribers:")
     o['foo'] = 'bar';
 
     # Remove first subscriber
     o.unsubscribe('foo', print_len)
 
     # Update now will only trigger second and third subscriber
-    print "Updating 'foo' after removing a subscriber:"
+    print("Updating 'foo' after removing a subscriber:")
     o['foo'] = 'bar2';
 
     # Publish a key as a function, in this case, a lambda function
     o.publish('baz', lambda : 42)
-    print "Published value of 'baz':", o['baz']
+    print("Published value of 'baz':", o['baz'])
 
     # Unpublish the key
     o.unpublish('baz')
 
     # This will return None, as there is no publisher
-    print "Value of 'baz' with no publisher:", o['baz']
+    print("Value of 'baz' with no publisher:", o['baz'])
 
     # Set 'baz' key, it gets cached
     o['baz'] = 'bazzz'
 
     # Now will return cached value, since no provider
-    print "Cached value of 'baz' after being set:", o['baz']
+    print("Cached value of 'baz' after being set:", o['baz'])