[pytango] 354/483: Fix python 3 problems

[Sandor Bodo-Merle]

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

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit f83017ff93d6ddd6c23df6984669d6bb31296fc9
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Thu Feb 6 19:13:04 2014 +0000

    Fix python 3 problems
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@24863 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 src/boost/python/__init__.py                          | 6 +++---
 src/boost/python/ipython/ipython_00_11/ipy_install.py | 2 +-
 src/boost/python/ipython/ipython_10_00/ipy_install.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/boost/python/__init__.py b/src/boost/python/__init__.py
index 9c9f060..87baadb 100644
--- a/src/boost/python/__init__.py
+++ b/src/boost/python/__init__.py
@@ -111,13 +111,13 @@ def __prepare_nt():
 
 if os.name == 'nt':
     try:
-        import _PyTango
+        from . import _PyTango
     except ImportError as ie:
         # in windows try to find the location for tango
         __prepare_nt()
-        import _PyTango
+        from . import _PyTango
 else:
-    import _PyTango
+    from . import _PyTango
         
 from ._PyTango import (AccessControlType, ApiUtil, ArchiveEventInfo,
     AsynCall, AsynReplyNotArrived, AttReqType, Attr, AttrConfEventData,
diff --git a/src/boost/python/ipython/ipython_00_11/ipy_install.py b/src/boost/python/ipython/ipython_00_11/ipy_install.py
index d246cb9..f86a466 100644
--- a/src/boost/python/ipython/ipython_00_11/ipy_install.py
+++ b/src/boost/python/ipython/ipython_00_11/ipy_install.py
@@ -55,7 +55,7 @@ def install(ipydir=None, verbose=True, profile='tango'):
     if verbose:
         out = sys.stdout
     else:
-        out = io.BytesIO()
+        out = io.StringIO()
     
     ipython_dir = ipydir or get_ipython_dir()
     try:
diff --git a/src/boost/python/ipython/ipython_10_00/ipy_install.py b/src/boost/python/ipython/ipython_10_00/ipy_install.py
index d246cb9..f86a466 100644
--- a/src/boost/python/ipython/ipython_10_00/ipy_install.py
+++ b/src/boost/python/ipython/ipython_10_00/ipy_install.py
@@ -55,7 +55,7 @@ def install(ipydir=None, verbose=True, profile='tango'):
     if verbose:
         out = sys.stdout
     else:
-        out = io.BytesIO()
+        out = io.StringIO()
     
     ipython_dir = ipydir or get_ipython_dir()
     try:

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