Changeset 66408


Ignore:
Timestamp:
Oct 4, 2015, 4:56:04 AM (9 years ago)
Author:
martinl
Message:

wx.metadata: use set_path() instead of get_lib_path()

Location:
grass-addons/grass7/gui/wxpython/wx.metadata
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • grass-addons/grass7/gui/wxpython/wx.metadata/db.csw.admin/db.csw.admin.py

    r66407 r66408  
    120120
    121121from grass.script import core as grass
    122 from grass.pygrass.utils import get_lib_path
    123 
    124 path = get_lib_path(modname='wx.metadata', libname='mdlib')
    125 if path is not None and path not in sys.path:
    126     sys.path.append(path)
    127 elif path is  None:
    128     grass.fatal("Fatal error: library < %s > not found " % 'mdlib')
     122from grass.pygrass.utils import set_path
     123
     124set_path(modulename='wx.metadata', dirname='mdlib')
    129125
    130126import getopt
  • grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.cswbrowser/g.gui.cswbrowser.py

    r66407 r66408  
    1414import os
    1515
    16 from grass.pygrass.utils import get_lib_path
     16from grass.pygrass.utils import set_path
    1717import grass.script as grass
    1818
    19 path = get_lib_path(modname='wx.metadata', libname='mdlib')
    20 if path is not None and path not in sys.path:
    21     sys.path.append(path)
    22 elif path is  None:
    23     grass.fatal("Fatal error: library < %s > not found " % 'mdlib')
     19set_path(modulename='wx.metadata', dirname='mdlib')
    2420
    2521import wx
  • grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata/g.gui.metadata.py

    r66407 r66408  
    2424import sys
    2525import os
    26 from grass.pygrass.utils import get_lib_path
     26from grass.pygrass.utils import set_path
    2727import grass.script as grass
    2828from grass.pydispatch import dispatcher
     
    3131from datacatalog.tree import LocationMapTree
    3232
    33 path = get_lib_path(modname='wx.metadata', libname='mdlib')
    34 if path is not None and path not in sys.path:
    35     sys.path.append(path)
    36 elif path is  None:
    37     grass.fatal("Fatal error: library < %s > not found " % 'mdlib')
     33set_path(modulename='wx.metadata', dirname='mdlib')
    3834
    3935import mdgrass
  • grass-addons/grass7/gui/wxpython/wx.metadata/mdlib/mdgrass.py

    r66407 r66408  
    2727
    2828from grass.script import core as grass
    29 from grass.pygrass.utils import get_lib_path
    30 
    31 path = get_lib_path(modname='wx.metadata', libname='mdlib')
    32 if path is not None and path not in sys.path:
    33     sys.path.append(path)
    34 elif path is  None:
    35     grass.fatal("Fatal error: library < %s > not found " % 'mdlib')
     29from grass.pygrass.utils import set_path
     30
     31set_path(modulename='wx.metadata', dirname='mdlib')
    3632
    3733from lxml import etree
  • grass-addons/grass7/gui/wxpython/wx.metadata/mdlib/mdpdffactory.py

    r66407 r66408  
    44    sys.exit('owslib library is missing. Check requirements on the manual page < https://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support >')
    55import tempfile, sys, os
    6 from grass.pygrass.utils import get_lib_path
     6from grass.pygrass.utils import set_path
    77from grass.script import core as grass
    88
    9 path = get_lib_path(modname='wx.metadata', libname='mdlib')
    10 if path is not None and path not in sys.path:
    11     sys.path.append(path)
    12 elif path is  None:
    13     grass.fatal("Fatal error: library < %s > not found " % 'mdlib')
     9set_path(modulename='wx.metadata', dirname='mdlib')
    1410
    1511import math
  • grass-addons/grass7/gui/wxpython/wx.metadata/r.info.iso/r.info.iso.py

    r66407 r66408  
    3939
    4040from grass.script import parser, fatal
    41 from grass.pygrass.utils import get_lib_path
     41from grass.pygrass.utils import set_path
    4242
    43 
    44 def load_mdlib(libs):
    45     for lib in libs:
    46         path = get_lib_path(modname='wx.metadata', libname=lib)
    47         if path is not None and path not in sys.path:
    48             sys.path.append(path)
    49         elif path is  None:
    50             fatal("Fatal error: library < %s > not found "%lib)
    51 
     43set_path(modulename='wx.metadata', dirname='mdlib')
    5244
    5345def main():
    5446    # load metadata library
    55     load_mdlib(['mdlib'])
    5647    from mdgrass import GrassMD
    5748
  • grass-addons/grass7/gui/wxpython/wx.metadata/t.info.iso/t.info.iso.py

    r66407 r66408  
    3939import grass.script as grass
    4040from grass.script import parser, fatal
    41 from grass.pygrass.utils import get_lib_path
     41from grass.pygrass.utils import set_path
    4242
    43 
    44 def load_mdlib(libs):
    45     for lib in libs:
    46         path = get_lib_path(modname='wx.metadata' ,libname=lib)
    47         if path is not None and path not in sys.path:
    48             sys.path.append(path)
    49         elif path is  None:
    50             fatal("Fatal error: library < %s > not found "%lib)
    51 
     43set_path(modulename='wx.metadata', dirname='mdlib')
    5244
    5345def main():
    5446    # load metadata library
    55     load_mdlib(['mdlib'])
    5647    from mdgrass import GrassMD
    5748
  • grass-addons/grass7/gui/wxpython/wx.metadata/v.info.iso/v.info.iso.py

    r66407 r66408  
    3838
    3939from grass.script import parser, fatal
    40 from grass.pygrass.utils import get_lib_path
     40from grass.pygrass.utils import set_path
    4141
    42 
    43 def load_mdlib(libs):
    44     for lib in libs:
    45         path = get_lib_path(modname='wx.metadata', libname=lib)
    46         if path is not None and path not in sys.path:
    47             sys.path.append(path)
    48         elif path is  None:
    49             fatal("Fatal error: library < %s > not found "%lib)
     42set_path(modulename='wx.metadata', dirname='mdlib')
    5043
    5144def main():
    5245    # load metadata library
    53     load_mdlib(['mdlib'])
    5446    from mdgrass import GrassMD
    5547
Note: See TracChangeset for help on using the changeset viewer.