[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37945] trunk/blender/release/scripts/ modules: console autocomp import now excludes '_' prefixed variables and the results are sorted.

Campbell Barton ideasman42 at gmail.com
Wed Jun 29 12:47:44 CEST 2011


Revision: 37945
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37945
Author:   campbellbarton
Date:     2011-06-29 10:47:43 +0000 (Wed, 29 Jun 2011)
Log Message:
-----------
console autocomp import now excludes '_' prefixed variables and the results are sorted.

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bpy/__init__.py
    trunk/blender/release/scripts/modules/console/intellisense.py

Modified: trunk/blender/release/scripts/modules/bpy/__init__.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/__init__.py	2011-06-29 09:46:00 UTC (rev 37944)
+++ trunk/blender/release/scripts/modules/bpy/__init__.py	2011-06-29 10:47:43 UTC (rev 37945)
@@ -22,24 +22,29 @@
 Give access to blender data and utility functions.
 """
 
+__all__ = (
+    "app",
+    "context",
+    "data",
+    "ops",
+    "path",
+    "props",
+    "types",
+    "utils",
+)
+
+
 # internal blender C module
-import _bpy
-from _bpy import types, props, app
+from _bpy import types, props, app, data, context
 
-data = _bpy.data
-context = _bpy.context
-
 # python modules
-from . import utils, path
-from . import ops as _ops_module
+from . import utils, path, ops
 
 # fake operator module
-ops = _ops_module.ops_fake_module
+ops = ops.ops_fake_module
 
-import sys as _sys
-
-
 def _main():
+    import sys as _sys
 
     # Possibly temp. addons path
     from os.path import join, dirname, normpath
@@ -59,3 +64,5 @@
 
 
 _main()
+
+del _main
\ No newline at end of file

Modified: trunk/blender/release/scripts/modules/console/intellisense.py
===================================================================
--- trunk/blender/release/scripts/modules/console/intellisense.py	2011-06-29 09:46:00 UTC (rev 37944)
+++ trunk/blender/release/scripts/modules/console/intellisense.py	2011-06-29 10:47:43 UTC (rev 37945)
@@ -53,7 +53,7 @@
     re.UNICODE)
 
 
-def complete(line, cursor, namespace, private=True):
+def complete(line, cursor, namespace, private):
     """Returns a list of possible completions:
 
     * name completion
@@ -82,6 +82,10 @@
         if RE_MODULE.match(line):
             from . import complete_import
             matches = complete_import.complete(line)
+            print(private)
+            if not private:
+                matches[:] = [m for m in matches if m[:1] != "_"]
+            matches.sort()
         else:
             from . import complete_namespace
             matches = complete_namespace.complete(word, namespace, private)




More information about the Bf-blender-cvs mailing list