wx.metadata/db.csw.admin, g.gui.cswbrowser, g.gui.metadata, t.info.is…

…o, v.info.iso: fix import mdlib

grass7/gui/wxpython/wx.metadata/db.csw.admin/db.csw.admin.py

@@ -120,9 +120,9 @@
 import getopt
 
 from grass.script import core as grass
-from grass.pygrass.utils import set_path
+from grass.script.utils import set_path
 
-set_path(modulename='wx.metadata', dirname='mdlib')
+set_path(modulename='wx.metadata', dirname='mdlib', path='..')
 
 from mdlib.cswutil import *
 

grass7/gui/wxpython/wx.metadata/g.gui.cswbrowser/g.gui.cswbrowser.py

@@ -9,17 +9,18 @@
 
 @author Matej Krejci <matejkrejci gmail.com> (GSoC 2015)
 """
+
 import grass.script as grass
+from grass.script.setup import set_gui_path
+
+grass.utils.set_path(modulename='wx.metadata', dirname='mdlib', path='..')
 
-from grass.pygrass.utils import set_path
-set_path(modulename='wx.metadata', dirname='mdlib')
+from mdlib.cswlib import CSWBrowserPanel, CSWConnectionPanel
 
 import wx
 
-from grass.script.setup import set_gui_path
 set_gui_path()
 
-from mdlib.cswlib import CSWBrowserPanel, CSWConnectionPanel
 
 class CswBrowserMainDialog(wx.Frame):
     def __init__(self,giface=None):

grass7/gui/wxpython/wx.metadata/g.gui.metadata/g.gui.metadata.py

@@ -21,41 +21,40 @@
 @author Matej Krejci <matejkrejci gmail.com> (GSoC 2014) (GSoC 2015)
 """
 
-import sys
 import os
+import sys
+import tempfile
+import webbrowser
+from functools import reduce
+
+from lxml import etree
 
-from grass.pygrass.utils import set_path
 import grass.script as grass
+import grass.temporal as tgis
 from grass.pydispatch import dispatcher
 from grass.pydispatch.signal import Signal
-import grass.temporal as tgis
-
 from grass.script.setup import set_gui_path
-from functools import reduce
-set_gui_path()
 
-from core.gcmd import RunCommand, GError, GMessage
-#from datacatalog.tree import LocationMapTree
-from core.utils import GetListOfLocations, ListOfMapsets
+set_gui_path()
 from core.debug import Debug
+from core.gcmd import GError, GMessage, RunCommand
+# from datacatalog.tree import LocationMapTree
+from core.utils import GetListOfLocations, ListOfMapsets
 
-set_path(modulename='wx.metadata', dirname='mdlib')
+grass.utils.set_path(modulename='wx.metadata', dirname='mdlib', path='..')
 
 from mdlib import mdgrass
 from mdlib import mdutil
-from mdlib.mdpdffactory import PdfCreator
 from mdlib.cswlib import CSWConnectionPanel
 from mdlib.mdeditorfactory import MdMainEditor
+from mdlib.mdpdffactory import PdfCreator
 
-from lxml import etree
 import wx
-from wx.lib.buttons import ThemedGenBitmapTextButton as BitmapBtnTxt
 from wx import SplitterWindow
+from wx.lib.buttons import ThemedGenBitmapTextButton as BitmapBtnTxt
 
-#from pydispatch import dispatcher
+# from pydispatch import dispatcher
 
-import webbrowser
-import tempfile
 #===============================================================================
 # MAIN FRAME
 #===============================================================================

grass7/gui/wxpython/wx.metadata/t.info.iso/t.info.iso.py

@@ -31,16 +31,15 @@
 #% required: no
 #%end
 
-
 import os
 import sys
 
-import grass.temporal as tgis
 import grass.script as grass
-from grass.script import parser, fatal
-from grass.pygrass.utils import set_path
+import grass.temporal as tgis
+from grass.script import parser
+
+grass.utils.set_path(modulename='wx.metadata', dirname='mdlib', path='..')
 
-set_path(modulename='wx.metadata', dirname='mdlib')
 
 def main():
     # load metadata library
@@ -80,4 +79,4 @@ def main():
 
 if __name__ == "__main__":
     options, flags = parser()
-    main()
+    sys.exit(main())

grass7/gui/wxpython/wx.metadata/v.info.iso/v.info.iso.py

@@ -36,10 +36,10 @@
 import os
 import sys
 
-from grass.script import parser, fatal
-from grass.pygrass.utils import set_path
+from grass.script import parser
+from grass.script.utils import set_path
 
-set_path(modulename='wx.metadata', dirname='mdlib')
+set_path(modulename='wx.metadata', dirname='mdlib', path='..')
 
 def main():
     # load metadata library
@@ -75,4 +75,4 @@ def main():
 
 if __name__ == "__main__":
     options, flags = parser()
-    main()
+    sys.exit(main())