|
@@ -17,7 +17,7 @@ for details.
|
|
|
|
|
|
.. sectionauthor:: Martin Landa <landa.martin gmail.com>
|
|
|
"""
|
|
|
-
|
|
|
+import re
|
|
|
import types
|
|
|
import string
|
|
|
try:
|
|
@@ -595,29 +595,29 @@ def command_info(cmd):
|
|
|
|
|
|
def cmdtuple_to_list(cmd):
|
|
|
"""Convert command tuple to list.
|
|
|
-
|
|
|
+
|
|
|
:param tuple cmd: GRASS command to be converted
|
|
|
-
|
|
|
+
|
|
|
:return: command in list
|
|
|
"""
|
|
|
cmdList = []
|
|
|
if not cmd:
|
|
|
return cmdList
|
|
|
-
|
|
|
+
|
|
|
cmdList.append(cmd[0])
|
|
|
-
|
|
|
+
|
|
|
if 'flags' in cmd[1]:
|
|
|
for flag in cmd[1]['flags']:
|
|
|
cmdList.append('-' + flag)
|
|
|
for flag in ('help', 'verbose', 'quiet', 'overwrite'):
|
|
|
if flag in cmd[1] and cmd[1][flag] is True:
|
|
|
cmdList.append('--' + flag)
|
|
|
-
|
|
|
+
|
|
|
for k, v in cmd[1].iteritems():
|
|
|
if k in ('flags', 'help', 'verbose', 'quiet', 'overwrite'):
|
|
|
continue
|
|
|
cmdList.append('%s=%s' % (k, v))
|
|
|
-
|
|
|
+
|
|
|
return cmdList
|
|
|
|
|
|
def cmdlist_to_tuple(cmd):
|
|
@@ -629,7 +629,7 @@ def cmdlist_to_tuple(cmd):
|
|
|
"""
|
|
|
if len(cmd) < 1:
|
|
|
return None
|
|
|
-
|
|
|
+
|
|
|
dcmd = {}
|
|
|
for item in cmd[1:]:
|
|
|
if '=' in item: # params
|
|
@@ -646,7 +646,7 @@ def cmdlist_to_tuple(cmd):
|
|
|
else: # unnamed parameter
|
|
|
module = parse_interface(cmd[0])
|
|
|
dcmd[module.define_first()] = item
|
|
|
-
|
|
|
+
|
|
|
return (cmd[0], dcmd)
|
|
|
|
|
|
def cmdstring_to_tuple(cmd):
|