[GRASS-SVN] r66291 - grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata

svn_grass at osgeo.org svn_grass at osgeo.org
Tue Sep 22 05:59:11 PDT 2015


Author: krejcmat
Date: 2015-09-22 05:59:11 -0700 (Tue, 22 Sep 2015)
New Revision: 66291

Modified:
   grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata/g.gui.metadata.py
Log:
wx.metadata addons: fix import datacatalog

Modified: grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata/g.gui.metadata.py
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata/g.gui.metadata.py	2015-09-22 12:36:02 UTC (rev 66290)
+++ grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata/g.gui.metadata.py	2015-09-22 12:59:11 UTC (rev 66291)
@@ -28,7 +28,13 @@
 from grass.pydispatch import dispatcher
 from core.gcmd import RunCommand, GError, GMessage
 import grass.temporal as tgis
-from lmgr import datacatalog
+try:
+    from datacatalog.catalog import DataCatalog as datacatalog
+except:
+    try:
+        from lmgr import datacatalog
+    except Exception,e:
+        grass.fatal(e)
 
 def load_mdlib(libs):
     for lib in libs:



More information about the grass-commit mailing list