[pytango] 121/483: changes for python 2.4

[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 c0349bacaffb7ca520dfdb4c6ee2db92beac1342
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Mon Jun 18 10:04:46 2012 +0000

    changes for python 2.4
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@20706 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 PyTango/ipython/__init__.py                  | 2 +-
 PyTango/ipython/ipython_00_11/ipy_install.py | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/PyTango/ipython/__init__.py b/PyTango/ipython/__init__.py
index 47c0b1e..35c6021 100644
--- a/PyTango/ipython/__init__.py
+++ b/PyTango/ipython/__init__.py
@@ -24,7 +24,7 @@
 __all__ = ["init_ipython", "install", "load_ipython_extension",
            "unload_ipython_extension", "load_config"]
 
-from .common import get_python_version, get_python_version_number, \
+from common import get_python_version, get_python_version_number, \
     get_ipython_version, get_ipython_version_list, \
     get_ipython_version_number, get_pytango_version, get_pytango_version_number
 
diff --git a/PyTango/ipython/ipython_00_11/ipy_install.py b/PyTango/ipython/ipython_00_11/ipy_install.py
index fe967af..0fb5d63 100644
--- a/PyTango/ipython/ipython_00_11/ipy_install.py
+++ b/PyTango/ipython/ipython_00_11/ipy_install.py
@@ -78,9 +78,14 @@ def install(ipydir=None, verbose=True, profile='tango'):
 
     profile = __PROFILE.format(pytangover=PyTango.Release.version,
                                ipyver=IPython.release.version)
-    with file(abs_config_file_name, "w") as f:
+    f = None
+    try:
+        f = file(abs_config_file_name, "w")
         f.write(profile)
-        f.close()
+    finally:
+        if f is not None:
+            f.close()
+
     out.write("[DONE]\n\n")
     out.write("""\
 To start ipython with tango interface simply type on the command line:

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