g.mremove: update python code for new g.mremove interface

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@61043 15284696-431f-4ddb-bdfa-cd5b030d7da7

lib/python/temporal/temporal_raster3d_algebra.py

@@ -50,7 +50,8 @@ class TemporalRaster3DAlgebraParser(TemporalRasterBaseAlgebraParser):
 
                 if self.run:
                     m = copy.deepcopy(self.m_mremove)
-                    m.inputs["rast3d"].value = stringlist
+                    m.inputs["type"].value = "rast3d"
+                    m.inputs["pattern"].value = stringlist
                     m.flags["f"].value = True
                     m.run()
 

lib/python/temporal/temporal_raster_algebra.py

@@ -91,7 +91,8 @@ class TemporalRasterAlgebraParser(TemporalRasterBaseAlgebraParser):
 
                 if self.run:
                     m = copy.deepcopy(self.m_mremove)
-                    m.inputs["rast"].value = stringlist
+                    m.inputs["type"].value = "rast"
+                    m.inputs["pattern"].value = stringlist
                     m.flags["f"].value = True
                     m.run()
 

lib/python/temporal/temporal_vector_algebra.py

@@ -520,11 +520,12 @@ class TemporalVectorAlgebraParser(TemporalAlgebraParser):
             for chunk in chunklist:
                 stringlist = ",".join(chunk)
                 if self.debug:
-                    print "g.mremove vect=%s"%(stringlist)
+                    print "g.mremove type=vect pattern=%s"%(stringlist)
 
                 if self.run:
                     m = copy.deepcopy(self.m_mremove)
-                    m.inputs["vect"].value = stringlist
+                    m.inputs["type"].value = "vect"
+                    m.inputs["pattern"].value = stringlist
                     m.flags["f"].value = True
                     m.run()
 

scripts/i.pansharpen/i.pansharpen.py

@@ -300,7 +300,7 @@ def main():
 
         
         # Cleanup
-        grass.run_command('g.mremove', flags='f', quiet=True, rast='tmp%s*,%s' % (pid,panmatch))
+        grass.run_command('g.mremove', flags='f', quiet=True, type="rast", pattern='tmp%s*,%s' % (pid,panmatch))
         
     #Could add other sharpening algorithms here, e.g. wavelet transformation
 
@@ -341,7 +341,7 @@ def main():
         grass.raster_history("%s_%s" % (out, ch))
 
     # Cleanup        
-    grass.run_command('g.mremove', flags="f", rast="tmp%s*" % pid, quiet=True)
+    grass.run_command('g.mremove', flags="f", type="rast", pattern="tmp%s*" % pid, quiet=True)
 
         
 def matchhist(original, target, matched):

scripts/r3.in.xyz/r3.in.xyz.py

@@ -179,7 +179,7 @@ from grass.script import core as grass
 
 def cleanup():
     grass.run_command('g.mremove', flags = 'f',
-		      rast = 'tmp.r3xyz.%d.*' % os.getpid(),
+		      type = "rast", pattern = 'tmp.r3xyz.%d.*' % os.getpid(),
 		      quiet = True)