Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-02-14 15:23:25 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-02-14 15:23:25 +0300
commit3871cb78bc727e61c45c4f256e3f575fbce3724a (patch)
treeceabba68a1ff2a7cac1e24257f5243ac11a481c2 /release/scripts
parent39c04315e2815bbd24c9ba5f7e0aa11736fa1c48 (diff)
autocompete was matching import_foo as import keyword.
breaking autocomp. on import_scene_obj for eg.
Diffstat (limited to 'release/scripts')
-rw-r--r--release/scripts/modules/console/intellisense.py2
-rw-r--r--release/scripts/op/console_python.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/modules/console/intellisense.py b/release/scripts/modules/console/intellisense.py
index 96896d5fd0e..0f9acf9b6a9 100644
--- a/release/scripts/modules/console/intellisense.py
+++ b/release/scripts/modules/console/intellisense.py
@@ -30,7 +30,7 @@ import re
# 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(
diff --git a/release/scripts/op/console_python.py b/release/scripts/op/console_python.py
index dab4899b3e6..15462841999 100644
--- a/release/scripts/op/console_python.py
+++ b/release/scripts/op/console_python.py
@@ -162,7 +162,7 @@ def autocomplete(context):
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