[GRASS-SVN] r48988 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-10-29 09:52:29 -0700 (Sat, 29 Oct 2011)
New Revision: 48988

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/prompt.py
Log:
wxGUI/gmodeler: auto-complete - check for 'entity'
		(merge r48987 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/prompt.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/prompt.py	2011-10-29 16:51:22 UTC (rev 48987)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/prompt.py	2011-10-29 16:52:29 UTC (rev 48988)
@@ -855,9 +855,9 @@
                             try:
                                 param = self.cmdDesc.get_param(paramName)
                             except (ValueError, AttributeError):
-                                return
+                                return None
                         else:
-                            return
+                            return None
                         
                         if param['values']:
                             toComplete['entity'] = 'param values'
@@ -949,7 +949,7 @@
             self.InsertText(pos, '=')
             self.CharRight()
             self.toComplete = self.EntityToComplete()
-            if self.toComplete:
+            if self.toComplete and 'entity' in self.toComplete:
                 if self.toComplete['entity'] == 'raster map':
                     self.autoCompList = self.mapList['raster']
                 elif self.toComplete['entity'] == 'vector map':