[GRASS-SVN] r48987 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-10-29 09:51:22 -0700 (Sat, 29 Oct 2011)
New Revision: 48987

Modified:
   grass/trunk/gui/wxpython/gui_modules/prompt.py
Log:
wxGUI/gmodeler: auto-complete - check for 'entity'


Modified: grass/trunk/gui/wxpython/gui_modules/prompt.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/prompt.py	2011-10-29 16:36:15 UTC (rev 48986)
+++ grass/trunk/gui/wxpython/gui_modules/prompt.py	2011-10-29 16:51:22 UTC (rev 48987)
@@ -852,9 +852,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'
@@ -946,7 +946,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':