Merge pull request #4536 from mwichmann/SConsExamples

Fix some more regex strings

Author: bdbaddog

bin/SConsExamples.py

@@ -554,7 +554,7 @@ def process(source_file, ofp):
             process(src, fp)
             fp.write('debug = ' + ARGUMENTS.get('debug', '0') + '\\n')
 
-public_class_re = re.compile('^public class (\S+)', re.MULTILINE)
+public_class_re = re.compile(r'^public class (\S+)', re.MULTILINE)
 
 def JavaCCom(target, source, env):
     # This is a fake Java compiler that just looks for

bin/scons-diff.py

@@ -115,11 +115,11 @@ def comma(x1, x2):
 
 diff_function = diff_map.get(diff_type, simple_diff)
 
-baseline_re = re.compile('(# |@REM )/home/\S+/baseline/')
-comment_rev_re = re.compile('(# |@REM )(\S+) 0.96.[CD]\d+ \S+ \S+( knight)')
-revision_re = re.compile('__revision__ = "[^"]*"')
-build_re = re.compile('__build__ = "[^"]*"')
-date_re = re.compile('__date__ = "[^"]*"')
+baseline_re = re.compile(r'(# |@REM )/home/\S+/baseline/')
+comment_rev_re = re.compile(r'(# |@REM )(\S+) 0.96.[CD]\d+ \S+ \S+( knight)')
+revision_re = re.compile(r'__revision__ = "[^"]*"')
+build_re = re.compile(r'__build__ = "[^"]*"')
+date_re = re.compile(r'__date__ = "[^"]*"')
 
 def lines_read(file):
     return open(file).readlines()

bin/scons-time.py

@@ -552,7 +552,7 @@ def find_next_run_number(self, dir, prefix):
         specified prefix, extracts the run numbers from each file name,
         and returns the next run number after the largest it finds.
         """
-        x = re.compile(re.escape(prefix) + '-([0-9]+).*')
+        x = re.compile(re.escape(prefix) + r'-([0-9]+).*')
         matches = [x.match(e) for e in os.listdir(dir)]
         matches = [_f for _f in matches if _f]
         if not matches: