[GRASS-SVN] r66066 - grass/branches/releasebranch_7_0/gui/wxpython/mapdisp

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Aug 29 17:50:59 PDT 2015


Author: annakrat
Date: 2015-08-29 17:50:59 -0700 (Sat, 29 Aug 2015)
New Revision: 66066

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py
Log:
wxGUI: fix import order so that GUI doesn't crash when there is a problem with ctypes (merge from trunk, r66065)

Modified: grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py	2015-08-30 00:49:04 UTC (rev 66065)
+++ grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/frame.py	2015-08-30 00:50:59 UTC (rev 66066)
@@ -31,7 +31,6 @@
 import wx.aui
 
 from core.render        import Map
-from vdigit.toolbars    import VDigitToolbar
 from mapdisp.toolbars   import MapToolbar, NvizIcons
 from mapdisp.gprint     import PrintOptions
 from core.gcmd          import GError, GMessage, RunCommand
@@ -263,6 +262,7 @@
         """Add vector digitizer toolbar
         """
         from vdigit.main import haveVDigit, VDigit
+        from vdigit.toolbars import VDigitToolbar
         
         if not haveVDigit:
             from vdigit import errorMsg



More information about the grass-commit mailing list