Merge lp:~maddevelopers/mg5amcnlo/tab_complete_for_mac into lp:~madteam/mg5amcnlo/trunk

[Johan Alwall]

Olivier, can you help check with different computers that the tab completion works everywhere?

Changed bind command for readline in bin/mg5 to allow tab complete for Mac OS X

[Olivier Mattelaer (olivier-mattelaer)]

In fact tab completion was working already before...
With some bug for finding path. This bug is solve in restrict_model (I made a local merge and it's still compatible with your change here)
So up to I know this works...

Do you have more information on the python instalation that fails to have autocompletion?
(pre-build python 2.6 comming with 10.6 maybe?)

review: Needs Information

[Johan Alwall (johan-alwall)]

The previous tab completion didn't work with the Python coming with
10.6 (on two different computers), while this one works out of the
box. If only it doesn't ruin tab completion on Linux machines (it
works on my laptop) I would suggest to do the merge, in order to avoid
problems for the many Mac users.

[Olivier Mattelaer (olivier-mattelaer)]

Ok that's the reason I'm on standard python. (The python coming with 10.6 is not exactly the python2.6 distributed on the web).

In fact I'm on a mac too, maybe we should also ask Tim for this, in order to be sure.

Cheers,

Olivier

review: Approve

[Johan Alwall (johan-alwall)]

Unfortunately we can't expect users to upgrade their Python if they
already have 2.6.x just for tab completion.

Can you try on some of the fynu machines with clean Python installs
(including readline)? It works fine on my Ubuntu, but would be good to
cross check with some other machines.

Thanks!

[Olivier Mattelaer (olivier-mattelaer)]

> Unfortunately we can't expect users to upgrade their Python if they
> already have 2.6.x just for tab completion.

Off course not

> Can you try on some of the fynu machines with clean Python installs
> (including readline)? It works fine on my Ubuntu, but would be good to
> cross check with some other machines.

Sure I will!!

=== removed file '.project'
--- .project	2010-08-16 15:41:39 +0000
+++ .project	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>MG-new_color_stuff</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.python.pydev.PyDevBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.python.pydev.pythonNature</nature>
-	</natures>
-</projectDescription>

=== modified file 'bin/mg5'
--- bin/mg5	2010-12-21 16:13:52 +0000
+++ bin/mg5	2010-12-21 23:17:52 +0000
@@ -19,21 +19,21 @@
 and call immediately the command line interface scripts"""
 
 import sys
-
 if not sys.version_info[0] == 2 or sys.version_info[1] < 6:
     sys.exit('MadGraph 5 works only with python 2.6 or later (but not python 3.X).\n\
                Please upgrate your version of python.')
 
+import os
+
 # tab completion and history
 try:
+    import rlcompleter
     import readline
 except ImportError:
     print "For tab completion and history, install module readline."
 else:
-    import rlcompleter
-    readline.parse_and_bind("tab: complete")
+    readline.parse_and_bind("bind ^I rl_complete")
     try:
-        import os
         history_file = os.path.join(os.environ['HOME'], '.pythonhistory')
         readline.read_history_file(history_file)
     except:
@@ -44,12 +44,11 @@
 import logging.config
 
 import subprocess
-import os.path as path
 
 # Get the parent directory (mg root) of the script real path (bin)
 # and add it to the current PYTHONPATH
 
-root_path = path.split(path.dirname(path.realpath( __file__ )))[0]
+root_path = os.path.split(os.path.dirname(os.path.realpath( __file__ )))[0]
 sys.path.append(root_path)
 
 
@@ -81,7 +80,7 @@
 # Set logging level according to the logging level given by options
 #logging.basicConfig(level=vars(logging)[options.logging])
 try:
-    logging.config.fileConfig(path.join(root_path, 'madgraph', 'interface', '.mg5_logging.conf'))
+    logging.config.fileConfig(os.path.join(root_path, 'madgraph', 'interface', '.mg5_logging.conf'))
     logging.root.setLevel(eval('logging.' + options.logging))
     logging.getLogger('madgraph').setLevel(eval('logging.' + options.logging))
 except: