|
@@ -3,13 +3,8 @@ from __future__ import (nested_scopes, generators, division, absolute_import,
|
|
|
with_statement, print_function, unicode_literals)
|
|
|
import sys
|
|
|
from multiprocessing import cpu_count
|
|
|
-
|
|
|
-if sys.version_info[0] == 2:
|
|
|
- from itertools import izip_longest as zip_longest
|
|
|
-else:
|
|
|
- from itertools import zip_longest
|
|
|
-from xml.etree.ElementTree import fromstring
|
|
|
import time
|
|
|
+from xml.etree.ElementTree import fromstring
|
|
|
|
|
|
from grass.exceptions import CalledModuleError, GrassError, ParameterError
|
|
|
from grass.script.core import Popen, PIPE
|
|
@@ -18,7 +13,13 @@ from .parameter import Parameter
|
|
|
from .flag import Flag
|
|
|
from .typedict import TypeDict
|
|
|
from .read import GETFROMTAG, DOC
|
|
|
-from grass.pygrass.messages import get_msgr
|
|
|
+from .env import G_debug
|
|
|
+
|
|
|
+
|
|
|
+if sys.version_info[0] == 2:
|
|
|
+ from itertools import izip_longest as zip_longest
|
|
|
+else:
|
|
|
+ from itertools import zip_longest
|
|
|
|
|
|
|
|
|
def _get_bash(self, *args, **kargs):
|
|
@@ -677,7 +678,7 @@ class Module(object):
|
|
|
termination. The handling of stdout and stderr must then be done
|
|
|
outside of this function.
|
|
|
"""
|
|
|
- get_msgr().debug(1, self.get_bash())
|
|
|
+ G_debug(1, self.get_bash())
|
|
|
if self.inputs['stdin'].value:
|
|
|
self.stdin = self.inputs['stdin'].value
|
|
|
self.stdin_ = PIPE
|