[GRASS-SVN] r69921 - in grass-addons/grass7/raster/r.green/r.green.hydro: r.green.hydro.delplants r.green.hydro.discharge r.green.hydro.financial r.green.hydro.optimal r.green.hydro.recommended r.green.hydro.structure r.green.hydro.technical r.green.hydro.theoretical
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Nov 25 14:57:40 PST 2016
Author: Giulia
Date: 2016-11-25 14:57:40 -0800 (Fri, 25 Nov 2016)
New Revision: 69921
Modified:
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.delplants/r.green.hydro.delplants.py
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.discharge/r.green.hydro.discharge.py
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.financial/r.green.hydro.financial.py
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.optimal/r.green.hydro.optimal.py
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.recommended/r.green.hydro.recommended.py
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.structure/r.green.hydro.structure.py
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.py
grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.theoretical/r.green.hydro.theoretical.py
Log:
r.green:fix path library
Modified: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.delplants/r.green.hydro.delplants.py
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.delplants/r.green.hydro.delplants.py 2016-11-25 22:42:38 UTC (rev 69920)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.delplants/r.green.hydro.delplants.py 2016-11-25 22:57:40 UTC (rev 69921)
@@ -117,8 +117,8 @@
from libhydro.plant import read_plants, write_plants
except ImportError:
try:
- set_path('r.green', 'libhydro', '../etc')
- set_path('r.green', 'libgreen', '../etc')
+ set_path('r.green', 'libhydro', os.path.join('..', 'etc', 'r.green'))
+ set_path('r.green', 'libgreen', os.path.join('..', 'etc', 'r.green'))
from libgreen.utils import cleanup
from libgreen.checkparameter import (check_required_columns,
exception2error)
Modified: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.discharge/r.green.hydro.discharge.py
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.discharge/r.green.hydro.discharge.py 2016-11-25 22:42:38 UTC (rev 69920)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.discharge/r.green.hydro.discharge.py 2016-11-25 22:57:40 UTC (rev 69921)
@@ -180,8 +180,8 @@
from libhydro.basin import dtm_corr
except ImportError:
try:
- set_path('r.green', 'libhydro', '../etc')
- set_path('r.green', 'libgreen', '../etc')
+ set_path('r.green', 'libhydro', os.path.join('..', 'etc', 'r.green'))
+ set_path('r.green', 'libgreen', os.path.join('..', 'etc', 'r.green'))
from libgreen.utils import cleanup
from libhydro.basin import dtm_corr
except ImportError:
Modified: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.financial/r.green.hydro.financial.py
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.financial/r.green.hydro.financial.py 2016-11-25 22:42:38 UTC (rev 69920)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.financial/r.green.hydro.financial.py 2016-11-25 22:57:40 UTC (rev 69921)
@@ -526,8 +526,8 @@
from libgreen.utils import cleanup
except ImportError:
try:
- set_path('r.green', 'libhydro', '../etc')
- set_path('r.green', 'libgreen', '../etc')
+ set_path('r.green', 'libhydro', os.path.join('..', 'etc', 'r.green'))
+ set_path('r.green', 'libgreen', os.path.join('..', 'etc', 'r.green'))
from libgreen.utils import cleanup
except ImportError:
warning('libgreen and libhydro not in the python path!')
Modified: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.optimal/r.green.hydro.optimal.py
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.optimal/r.green.hydro.optimal.py 2016-11-25 22:42:38 UTC (rev 69920)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.optimal/r.green.hydro.optimal.py 2016-11-25 22:57:40 UTC (rev 69921)
@@ -118,8 +118,8 @@
from libhydro.optimal import write_points
except ImportError:
try:
- set_path('r.green', 'libhydro', '../etc')
- set_path('r.green', 'libgreen', '../etc')
+ set_path('r.green', 'libhydro', os.path.join('..', 'etc', 'r.green'))
+ set_path('r.green', 'libgreen', os.path.join('..', 'etc', 'r.green'))
from libgreen.utils import cleanup
from libgreen.utils import dissolve_lines
from libhydro.optimal import find_segments
Modified: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.recommended/r.green.hydro.recommended.py
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.recommended/r.green.hydro.recommended.py 2016-11-25 22:42:38 UTC (rev 69920)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.recommended/r.green.hydro.recommended.py 2016-11-25 22:57:40 UTC (rev 69921)
@@ -213,8 +213,8 @@
from libhydro.plant import power2energy
except ImportError:
try:
- set_path('r.green', 'libhydro', '../etc')
- set_path('r.green', 'libgreen', '../etc')
+ set_path('r.green', 'libhydro', os.path.join('..', 'etc', 'r.green'))
+ set_path('r.green', 'libgreen', os.path.join('..', 'etc', 'r.green'))
from libgreen.utils import cleanup
from libhydro.plant import power2energy
except ImportError:
Modified: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.structure/r.green.hydro.structure.py
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.structure/r.green.hydro.structure.py 2016-11-25 22:42:38 UTC (rev 69920)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.structure/r.green.hydro.structure.py 2016-11-25 22:57:40 UTC (rev 69921)
@@ -145,8 +145,8 @@
from libgreen.utils import cleanup
except ImportError:
try:
- set_path('r.green', 'libhydro', '../etc')
- set_path('r.green', 'libgreen', '../etc')
+ set_path('r.green', 'libhydro', os.path.join('..', 'etc', 'r.green'))
+ set_path('r.green', 'libgreen', os.path.join('..', 'etc', 'r.green'))
from libgreen.utils import cleanup
except ImportError:
warning('libgreen and libhydro not in the python path!')
Modified: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.py
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.py 2016-11-25 22:42:38 UTC (rev 69920)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.py 2016-11-25 22:57:40 UTC (rev 69921)
@@ -250,8 +250,8 @@
from libhydro.optimal import conv_segpoints
except ImportError:
try:
- set_path('r.green', 'libhydro', '../etc')
- set_path('r.green', 'libgreen', '../etc')
+ set_path('r.green', 'libhydro', os.path.join('..', 'etc', 'r.green'))
+ set_path('r.green', 'libgreen', os.path.join('..', 'etc', 'r.green'))
from libgreen.utils import cleanup
from libhydro.plant import power2energy
from libhydro.optimal import conv_segpoints
Modified: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.theoretical/r.green.hydro.theoretical.py
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.theoretical/r.green.hydro.theoretical.py 2016-11-25 22:42:38 UTC (rev 69920)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.theoretical/r.green.hydro.theoretical.py 2016-11-25 22:57:40 UTC (rev 69921)
@@ -114,8 +114,8 @@
from libgreen.utils import remove_pixel_from_raster
except ImportError:
try:
- set_path('r.green', 'libhydro', '../etc')
- set_path('r.green', 'libgreen', '../etc')
+ set_path('r.green', 'libhydro', os.path.join('..', 'etc', 'r.green'))
+ set_path('r.green', 'libgreen', os.path.join('..', 'etc', 'r.green'))
from libgreen.utils import cleanup
from libhydro.basin import dtm_corr
from libhydro.plant import power2energy
More information about the grass-commit
mailing list