[pytango] 297/483: git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk at 24225 4e9c00fd-8f2e-0410-aa12-93ce3db5e235

[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 df51715e8b1a8486858a1d63776860a336a0d594
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Fri Nov 15 16:27:15 2013 +0000

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

diff --git a/src/boost/python/ipython/ipython_00_11/__init__.py b/src/boost/python/ipython/ipython_00_11/__init__.py
index ffdd695..f9578e9 100644
--- a/src/boost/python/ipython/ipython_00_11/__init__.py
+++ b/src/boost/python/ipython/ipython_00_11/__init__.py
@@ -12,6 +12,6 @@
 __all__ = ['load_ipython_extension', 'unload_ipython_extension', 'load_config',
            'run', 'install', 'is_installed']
 
-from .ipython_00_11 import load_ipython_extension, unload_ipython_extension, \
+from .ipython_10_00 import load_ipython_extension, unload_ipython_extension, \
     load_config, run
 from .ipy_install import install, is_installed
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 997a2db..68dbed3 100644
--- a/src/boost/python/ipython/ipython_00_11/ipy_install.py
+++ b/src/boost/python/ipython/ipython_00_11/ipy_install.py
@@ -39,14 +39,15 @@ PyTango.ipython.load_config(config)
 # Put any additional environment here
 """
 
+_CONFIG_FILE_NAME = 'ipython_config.py'
+
 def is_installed(ipydir=None, profile='tango'):
     ipython_dir = ipydir or get_ipython_dir()
     try:
         p_dir = ProfileDir.find_profile_dir_by_name(ipython_dir, profile)
     except ProfileDirError:
         return False
-    config_file_name = BaseIPythonApplication.config_file_name.default_value
-    abs_config_file_name = os.path.join(p_dir.location, config_file_name)
+    abs_config_file_name = os.path.join(p_dir.location, _CONFIG_FILE_NAME)
     return os.path.isfile(abs_config_file_name)
 
 def install(ipydir=None, verbose=True, profile='tango'):
@@ -60,9 +61,7 @@ def install(ipydir=None, verbose=True, profile='tango'):
         p_dir = ProfileDir.find_profile_dir_by_name(ipython_dir, profile)
     except ProfileDirError:
         p_dir = ProfileDir.create_profile_dir_by_name(ipython_dir, profile)
-    
-    config_file_name = BaseIPythonApplication.config_file_name.default_value
-    abs_config_file_name = os.path.join(p_dir.location, config_file_name)
+    abs_config_file_name = os.path.join(p_dir.location, _CONFIG_FILE_NAME)
     create_config = True
     if os.path.isfile(abs_config_file_name):
         create_config = ask_yes_no("Tango configuration file already exists. "\

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