[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26885] trunk/blender/release/scripts: autocompete was matching import_foo as import keyword.

[Campbell Barton]

Revision: 26885
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26885
Author:   campbellbarton
Date:     2010-02-14 13:23:25 +0100 (Sun, 14 Feb 2010)

Log Message:
-----------
autocompete was matching import_foo as import keyword.
breaking autocomp. on import_scene_obj for eg.

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/console/intellisense.py
    trunk/blender/release/scripts/op/console_python.py

Modified: trunk/blender/release/scripts/modules/console/intellisense.py
===================================================================
--- trunk/blender/release/scripts/modules/console/intellisense.py	2010-02-14 11:21:21 UTC (rev 26884)
+++ trunk/blender/release/scripts/modules/console/intellisense.py	2010-02-14 12:23:25 UTC (rev 26885)
@@ -30,7 +30,7 @@
 # regular expressions to find out which completer we need
 
 # line which starts with an import statement
-RE_MODULE = re.compile('^import|from.+')
+RE_MODULE = re.compile('^import(\s|$)|from.+')
 
 # The following regular expression means an 'unquoted' word
 RE_UNQUOTED_WORD = re.compile(

Modified: trunk/blender/release/scripts/op/console_python.py
===================================================================
--- trunk/blender/release/scripts/op/console_python.py	2010-02-14 11:21:21 UTC (rev 26884)
+++ trunk/blender/release/scripts/op/console_python.py	2010-02-14 12:23:25 UTC (rev 26885)
@@ -162,7 +162,7 @@
             line=current_line.line,
             cursor=current_line.current_character,
             namespace=console.locals,
-            private='-d' in sys.argv)
+            private=bpy.app.debug)
 
     # Now we need to copy back the line from blender back into the
     # text editor. This will change when we dont use the text editor