[pytango] 10/26: Fix bug in python 3 in lsdev

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to annotated tag v8.1.8
in repository pytango.

commit 33c68c73735057538a91165379e49173153f63ac
Author: coutinho <coutinho at esrf.fr>
Date:   Fri Sep 18 11:29:04 2015 +0200

    Fix bug in python 3 in lsdev
---
 src/boost/python/ipython/ipython_00_10/ipython_00_10.py | 6 ++----
 src/boost/python/ipython/ipython_00_11/ipython_00_11.py | 4 +---
 src/boost/python/ipython/ipython_10_00/ipython_10_00.py | 4 +---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/boost/python/ipython/ipython_00_10/ipython_00_10.py b/src/boost/python/ipython/ipython_00_10/ipython_00_10.py
index 9bc8a6c..accee70 100644
--- a/src/boost/python/ipython/ipython_00_10/ipython_00_10.py
+++ b/src/boost/python/ipython/ipython_00_10/ipython_00_10.py
@@ -238,7 +238,7 @@ def magic_lsdev(self, parameter_s=''):
         return
     data = db._db_cache.devices
 
-    s = io.BytesIO()
+    s = io.StringIO()
     cols = 40, 25, 25, 20
     l = "%{0}s %{1}s %{2}s %{3}s".format(*cols)
     print(l % ("Device", "Alias", "Server", "Class"), file=s)
@@ -269,7 +269,6 @@ def magic_lsdevclass(self, parameter_s=''):
         return
     data = db._db_cache.klasses
 
-    s = io.BytesIO()
     data = [ "%-030s" % klass for klass in data.keys() if not reg_exp or reg_exp.match(klass) ]
     s = textwrap.fill(" ".join(data), 80)
     IPython.genutils.page(s)
@@ -294,7 +293,6 @@ def magic_lsserv(self, parameter_s=''):
         return
     data = db._db_cache.servers
 
-    s = io.BytesIO()
     data = [ "%-030s" % server for server in data.keys() if not reg_exp or reg_exp.match(server) ]
     s = textwrap.fill(" ".join(data), 80)
     IPython.genutils.page(s)
@@ -676,7 +674,7 @@ def __store(ip, var):
     # we hide the standard output 
     stdout = sys.stdout
     try:
-        sys.stdout = io.BytesIO()
+        sys.stdout = io.StringIO()
         ip.magic("store %s" % var)
     finally:
         sys.stdout = stdout
diff --git a/src/boost/python/ipython/ipython_00_11/ipython_00_11.py b/src/boost/python/ipython/ipython_00_11/ipython_00_11.py
index ac3a8d2..ad4cd69 100644
--- a/src/boost/python/ipython/ipython_00_11/ipython_00_11.py
+++ b/src/boost/python/ipython/ipython_00_11/ipython_00_11.py
@@ -272,7 +272,7 @@ def lsdev(self, parameter_s=''):
         return
     data = db._db_cache.devices
 
-    s = io.BytesIO()
+    s = io.StringIO()
     lengths = 40, 25, 25, 20
     title = "Device", "Alias", "Server", "Class"
     templ = "{0:{l[0]}} {1:{l[1]}} {2:{l[2]}} {3:{l[3]}}"
@@ -306,7 +306,6 @@ def lsdevclass(self, parameter_s=''):
         return
     data = db._db_cache.klasses
 
-    s = io.BytesIO()
     data = [ "%-030s" % klass for klass in data.keys() if not reg_exp or reg_exp.match(klass) ]
     s = textwrap.fill(" ".join(data), 80)
     page(s)
@@ -331,7 +330,6 @@ def lsserv(self, parameter_s=''):
         return
     data = db._db_cache.servers
 
-    s = io.BytesIO()
     data = [ "%-030s" % server for server in data.keys() if not reg_exp or reg_exp.match(server) ]
     s = textwrap.fill(" ".join(data), 80)
     page(s)
diff --git a/src/boost/python/ipython/ipython_10_00/ipython_10_00.py b/src/boost/python/ipython/ipython_10_00/ipython_10_00.py
index 9137bc8..3e28b10 100644
--- a/src/boost/python/ipython/ipython_10_00/ipython_10_00.py
+++ b/src/boost/python/ipython/ipython_10_00/ipython_10_00.py
@@ -272,7 +272,7 @@ def lsdev(self, parameter_s=''):
         return
     data = db._db_cache.devices
 
-    s = io.BytesIO()
+    s = io.StringIO()
     lengths = 40, 25, 25, 20
     title = "Device", "Alias", "Server", "Class"
     templ = "{0:{l[0]}} {1:{l[1]}} {2:{l[2]}} {3:{l[3]}}"
@@ -306,7 +306,6 @@ def lsdevclass(self, parameter_s=''):
         return
     data = db._db_cache.klasses
 
-    s = io.BytesIO()
     data = [ "%-030s" % klass for klass in data.keys() if not reg_exp or reg_exp.match(klass) ]
     s = textwrap.fill(" ".join(data), 80)
     page(s)
@@ -331,7 +330,6 @@ def lsserv(self, parameter_s=''):
         return
     data = db._db_cache.servers
 
-    s = io.BytesIO()
     data = [ "%-030s" % server for server in data.keys() if not reg_exp or reg_exp.match(server) ]
     s = textwrap.fill(" ".join(data), 80)
     page(s)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git