r6329 - in /1.3: dep_check.py prompt/interpreter.py -- June 08, 2008 - 01:03

Author: bugman
Date: Sun Jun  8 01:03:35 2008
New Revision: 6329

URL: http://svn.gna.org/viewcvs/relax?rev=6329&view=rev
Log:
Shifted the readline dependency check into dep_check.


Modified:
    1.3/dep_check.py
    1.3/prompt/interpreter.py

Modified: 1.3/dep_check.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/dep_check.py?rev=6329&r1=6328&r2=6329&view=diff
==============================================================================
--- 1.3/dep_check.py (original)
+++ 1.3/dep_check.py Sun Jun  8 01:03:35 2008
@@ -61,6 +61,14 @@
 # Optional packages.
 ####################
 
+# Readline module.
+try:
+    import readline
+    del readline
+    readline_module = True
+except ImportError:
+    readline_module = False
+
 # BZ2 compression module.
 try:
     import bz2

Modified: 1.3/prompt/interpreter.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/interpreter.py?rev=6329&r1=6328&r2=6329&view=diff
==============================================================================
--- 1.3/prompt/interpreter.py (original)
+++ 1.3/prompt/interpreter.py Sun Jun  8 01:03:35 2008
@@ -23,14 +23,14 @@
 # Module docstring.
 """The prompt based relax user interface (UI)."""
 
+# Dependency check module.
+import dep_check
+
 # Python module imports.
 from code import InteractiveConsole, softspace
 from os import F_OK, access
-try:
+if dep_check.readline_module:
     import readline
-    readline_avail = True
-except ImportError:
-    readline_avail = False
 import sys
 
 # Python modules accessible on the command prompt.
@@ -42,7 +42,7 @@
 # Auxiliary modules.
 from help import _Helper, _Helper_python
 from command import Ls, Lh, Ll, system
-if readline_avail:
+if dep_check.readline_module:
     from tab_completion import Tab_completion
 
 # User functions.
@@ -243,7 +243,7 @@
         self.local = locals()
 
         # Setup tab completion.
-        if readline_avail:
+        if dep_check.readline_module:
             
readline.set_completer(Tab_completion(name_space=self.local).finish)
             readline.set_completer_delims(' \t\n`~!@#$%^&*()=+{}\\|;:",<>/?')
             #readline.set_completer_delims(' 
\t\n`~!@#$%^&*()=+{}\\|;:\'",<>/?')