fix disable_curdir_processing decorator

yanne · yanne · commit 046957e613ee · 2019-09-03T07:29:37.000+03:00
diff --git a/src/robot/parsing/__init__.py b/src/robot/parsing/__init__.py
@@ -54,6 +54,7 @@ def print_suite(suite):
 from .lexer import TestCaseFileLexer, ResourceFileLexer
 from .nodes import TestCaseSection
 from .parser import RobotFrameworkParser
+from . import lexerwrapper
 
 
 # TODO: remove/inline
@@ -74,12 +75,10 @@ def get_resource_file_ast(source):
 def disable_curdir_processing(method):
     """Decorator to disable processing `${CURDIR}` variable."""
     def decorated(*args, **kwargs):
-        pass
-        # FIXME
-        # original = populators.PROCESS_CURDIR
-        # populators.PROCESS_CURDIR = False
-        # try:
-        #     return method(*args, **kwargs)
-        # finally:
-        #     populators.PROCESS_CURDIR = original
-    return method
+        original = lexerwrapper.PROCESS_CURDIR
+        lexerwrapper.PROCESS_CURDIR = False
+        try:
+            return method(*args, **kwargs)
+        finally:
+            lexerwrapper.PROCESS_CURDIR = original
+    return decorated
diff --git a/src/robot/parsing/lexerwrapper.py b/src/robot/parsing/lexerwrapper.py
@@ -20,6 +20,9 @@
 from robot.utils import Utf8Reader, get_error_message
 
 
+PROCESS_CURDIR = True
+
+
 class LexerWrapper(object):
 
     def __init__(self, lexer, source):
@@ -42,7 +45,7 @@ def token(self):
         if token and token.type == token.ERROR:
             self._report_error(token)
             return self._next_token_after_eos()
-        if token and '${CURDIR}' in token.value:
+        if token and '${CURDIR}' in token.value and PROCESS_CURDIR:
             token.value = token.value.replace('${CURDIR}', self.curdir)
         return token
 
