[GRASS-SVN] r63653 - in grass/branches/releasebranch_7_0: . lib/python/pygrass/modules lib/python/pygrass/vector/testsuite lib/python/script raster/r.category scripts/r3.in.xyz
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Dec 20 09:20:37 PST 2014
Author: neteler
Date: 2014-12-20 09:20:37 -0800 (Sat, 20 Dec 2014)
New Revision: 63653
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/lib/python/pygrass/modules/shortcuts.py
grass/branches/releasebranch_7_0/lib/python/pygrass/vector/testsuite/test_vector3d.py
grass/branches/releasebranch_7_0/lib/python/script/raster.py
grass/branches/releasebranch_7_0/raster/r.category/test_rcategory_doctest.txt
grass/branches/releasebranch_7_0/scripts/r3.in.xyz/r3.in.xyz.py
Log:
update g.list/g.remove calls to use new element names (#2409) (trunk, r63652)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63616,63624,63626,63628,63630,63634,63644,63650
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63616,63624,63626,63628,63630,63634,63644,63650,63652
Modified: grass/branches/releasebranch_7_0/lib/python/pygrass/modules/shortcuts.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/pygrass/modules/shortcuts.py 2014-12-20 17:17:19 UTC (rev 63652)
+++ grass/branches/releasebranch_7_0/lib/python/pygrass/modules/shortcuts.py 2014-12-20 17:20:37 UTC (rev 63653)
@@ -20,7 +20,7 @@
'g.list'
>>> g_list.required
['type']
- >>> g_list.inputs.type = 'rast'
+ >>> g_list.inputs.type = 'raster'
>>> g_list.stdout_ = -1
>>> g_list.run()
Module('g.list')
Modified: grass/branches/releasebranch_7_0/lib/python/pygrass/vector/testsuite/test_vector3d.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/pygrass/vector/testsuite/test_vector3d.py 2014-12-20 17:17:19 UTC (rev 63652)
+++ grass/branches/releasebranch_7_0/lib/python/pygrass/vector/testsuite/test_vector3d.py 2014-12-20 17:20:37 UTC (rev 63653)
@@ -61,7 +61,7 @@
"""Remove the generated vector map, if exist"""
mset = get_mapset_vector(cls.tmpname, mapset='')
if mset:
- run_command("g.remove", flags='f', type='vect', name=cls.tmpname)
+ run_command("g.remove", flags='f', type='vector', name=cls.tmpname)
if __name__ == '__main__':
Modified: grass/branches/releasebranch_7_0/lib/python/script/raster.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/script/raster.py 2014-12-20 17:17:19 UTC (rev 63652)
+++ grass/branches/releasebranch_7_0/lib/python/script/raster.py 2014-12-20 17:20:37 UTC (rev 63653)
@@ -122,7 +122,7 @@
0
>>> p2.wait()
1
- >>> run_command('g.remove', flags='f', type='rast', name=output)
+ >>> run_command('g.remove', flags='f', type='raster', name=output)
:param str exp: expression
:param bool quiet: True to run quietly (<tt>--q</tt>)
Modified: grass/branches/releasebranch_7_0/raster/r.category/test_rcategory_doctest.txt
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.category/test_rcategory_doctest.txt 2014-12-20 17:17:19 UTC (rev 63652)
+++ grass/branches/releasebranch_7_0/raster/r.category/test_rcategory_doctest.txt 2014-12-20 17:20:37 UTC (rev 63653)
@@ -231,9 +231,9 @@
when test finishes. It could test if everything which was expected
to be created was created if it would check all outputs properly.
->>> run_command('g.remove', flags='f', type='rast', name='test')
+>>> run_command('g.remove', flags='f', type='raster', name='test')
0
->>> run_command('g.remove', flags='f', type='rast', name='test_14')
+>>> run_command('g.remove', flags='f', type='raster', name='test_14')
0
->>> run_command('g.remove', flags='f', type='rast', name='test_d')
+>>> run_command('g.remove', flags='f', type='raster', name='test_d')
0
Modified: grass/branches/releasebranch_7_0/scripts/r3.in.xyz/r3.in.xyz.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r3.in.xyz/r3.in.xyz.py 2014-12-20 17:17:19 UTC (rev 63652)
+++ grass/branches/releasebranch_7_0/scripts/r3.in.xyz/r3.in.xyz.py 2014-12-20 17:20:37 UTC (rev 63653)
@@ -307,7 +307,7 @@
grass.verbose(_("Assembling 3D cube ..."))
#input order: lower most strata first
- slices = grass.read_command('g.list', type='rast', sep=',',
+ slices = grass.read_command('g.list', type='raster', sep=',',
pattern='tmp.r3xyz.%d.*' % os.getpid()).rstrip(os.linesep)
grass.debug(slices)
More information about the grass-commit
mailing list