Merge pull request #1552 from aleksandy/fix-invalid-escape-sequence

use raw strings to prevent "invalid escape sequence '\<char>'"

Author: xael-fry

framework/pym/play/application.py

@@ -443,7 +443,7 @@ def expandvar(match):
             else: # unkonwn
                 return '${%s}' % key
 
-        return re.sub('\${([a-z.]+)}', expandvar, value)
+        return re.sub(r'\${([a-z.]+)}', expandvar, value)
 
 def hasKey(arr, elt):
     try:

framework/pym/play/commands/check.py

@@ -72,7 +72,7 @@ class Release(object):
     def __init__(self, strversion):
         self.strversion = strversion
         try:
-            self.numpart = re.findall("\d+[\.\d+]+", strversion)[0]
+            self.numpart = re.findall(r"\d+[\.\d+]+", strversion)[0]
         except:
             self.numpart = ''
         self.rest = strversion.replace(self.numpart, "")

framework/pym/play/commands/help.py

@@ -23,7 +23,7 @@ def execute(**kargs):
             print(open(help_file, 'r').read())
         else:
             exists = False
-            slugCmd = re.sub('[-\s]+', '-', re.sub('[^\w\s-]', '', cmd.encode('ascii', 'ignore')).strip().lower())
+            slugCmd = re.sub(r'[-\s]+', '-', re.sub(r'[^\w\s-]', '', cmd.encode('ascii', 'ignore')).strip().lower())
             for module in app.modules():
                 help_file = os.path\
                     .join(module, 'documentation', 'commands',

framework/pym/play/commands/modulesrepo.py

@@ -82,7 +82,7 @@ def get_repositories(play_base):
         repos = []
         f = file(repopath)
         for line in f:
-            if not re.match("^\s*#", line) and not line.strip() == "":
+            if not re.match(r"^\s*#", line) and not line.strip() == "":
                 repos.append(line.strip())
         if len(repos) > 0:
             return repos

framework/pym/play/utils.py

@@ -17,11 +17,11 @@ def playVersion(play_env):
 
 def replaceAll(file, searchExp, replaceExp, regexp=False):
     if not regexp:
-        replaceExp = replaceExp.replace('\\', '\\\\')
-        searchExp = searchExp.replace('$', '\\$')
-        searchExp = searchExp.replace('{', '\\{')
-        searchExp = searchExp.replace('}', '\\}')
-        searchExp = searchExp.replace('.', '\\.')
+        replaceExp = replaceExp.replace('\\', r'\\')
+        searchExp = searchExp.replace('$', r'\$')
+        searchExp = searchExp.replace('{', r'\{')
+        searchExp = searchExp.replace('}', r'\}')
+        searchExp = searchExp.replace('.', r'\.')
     for line in fileinput.input(file, inplace=1):
         line = re.sub(searchExp, replaceExp, line)
         sys.stdout.write(line)
@@ -44,7 +44,7 @@ def isParentOf(path1, path2):
         sep = os.sep
         if sep == '\\':
             sep = '\\\\'
-        ptn = '^\.\.(' + sep + '\.\.)*$'
+        ptn = r'^\.\.(' + sep + r'\.\.)*$'
         return re.match(ptn, relpath) != None
     except:
         return False
@@ -255,7 +255,7 @@ def get_java_version():
     java_version = sp.communicate()
     java_version = str(java_version)
 
-    result = re.search('version "([a-zA-Z0-9\.\-_]{1,})"', java_version)
+    result = re.search(r'version "([a-zA-Z0-9\.\-_]{1,})"', java_version)
 
     if result:
         return result.group(1)