diff options
| -rw-r--r-- | bin/SConsDoc.py | 4 | ||||
| -rwxr-xr-x | src/CHANGES.txt | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Scanner/D.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Scanner/LaTeX.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Scanner/SWIG.py | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/bin/SConsDoc.py b/bin/SConsDoc.py index 962073e..5fd5f00 100644 --- a/bin/SConsDoc.py +++ b/bin/SConsDoc.py @@ -155,8 +155,8 @@ if not has_etree: except ImportError: raise ImportError("Failed to import ElementTree from any known place") -re_entity = re.compile("\&([^;]+);") -re_entity_header = re.compile("<!DOCTYPE\s+sconsdoc\s+[^\]]+\]>") +re_entity = re.compile(r"\&([^;]+);") +re_entity_header = re.compile(r"<!DOCTYPE\s+sconsdoc\s+[^\]]+\]>") # Namespace for the SCons Docbook XSD dbxsd="http://www.scons.org/dbxsd/v1.0" diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 2d62291..76cccac 100755 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -64,6 +64,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Fix coding error in docbook tool only exercised when using python lxml - Recognize two additional GNU compiler header directory options in ParseFlags: -iquote and -idirafter. + - Fix more re patterns that contain \ but not specified as raw strings RELEASE 3.0.5 - Mon, 26 Mar 2019 15:04:42 -0700 diff --git a/src/engine/SCons/Scanner/D.py b/src/engine/SCons/Scanner/D.py index 95496d5..b3fb29e 100644 --- a/src/engine/SCons/Scanner/D.py +++ b/src/engine/SCons/Scanner/D.py @@ -46,7 +46,7 @@ class D(SCons.Scanner.Classic): name = "DScanner", suffixes = '$DSUFFIXES', path_variable = 'DPATH', - regex = '(?:import\s+)([\w\s=,.]+)(?:\s*:[\s\w,=]+)?(?:;)' + regex = r'(?:import\s+)([\w\s=,.]+)(?:\s*:[\s\w,=]+)?(?:;)' ) def find_include(self, include, source_dir, path): diff --git a/src/engine/SCons/Scanner/LaTeX.py b/src/engine/SCons/Scanner/LaTeX.py index 1cf2567..fd0391b 100644 --- a/src/engine/SCons/Scanner/LaTeX.py +++ b/src/engine/SCons/Scanner/LaTeX.py @@ -348,7 +348,7 @@ class LaTeX(SCons.Scanner.Base): # Cache the includes list in node so we only scan it once: # path_dict = dict(list(path)) # add option for whitespace (\s) before the '[' - noopt_cre = re.compile('\s*\[.*$') + noopt_cre = re.compile(r'\s*\[.*$') if node.includes is not None: includes = node.includes else: diff --git a/src/engine/SCons/Scanner/SWIG.py b/src/engine/SCons/Scanner/SWIG.py index 2650e4b..a333134 100644 --- a/src/engine/SCons/Scanner/SWIG.py +++ b/src/engine/SCons/Scanner/SWIG.py @@ -34,7 +34,7 @@ import SCons.Scanner SWIGSuffixes = [ '.i' ] def SWIGScanner(): - expr = '^[ \t]*%[ \t]*(?:include|import|extern)[ \t]*(<|"?)([^>\s"]+)(?:>|"?)' + expr = r'^[ \t]*%[ \t]*(?:include|import|extern)[ \t]*(<|"?)([^>\s"]+)(?:>|"?)' scanner = SCons.Scanner.ClassicCPP("SWIGScanner", ".i", "SWIGPATH", expr) return scanner |