Merge ~xypron/maas-images:re into maas-images:master

[Heinrich Schuchardt]

Avoid invalid escape sequences in strings

Use raw strings for regular expressions to avoid errors like:

    SyntaxWarning: invalid escape sequence '\s'

[Alexsander de Souza (alexsander-souza)]

+1

review: Approve

diff --git a/curtin/centos6/curtin-hooks.py b/curtin/centos6/curtin-hooks.py
index 6720839..109e010 100755
--- a/curtin/centos6/curtin-hooks.py
+++ b/curtin/centos6/curtin-hooks.py
@@ -119,7 +119,7 @@ def write_fstab(target, curtin_fstab):
 def extract_kernel_params(data):
     """Extracts the kernel parametes from the provided
     grub config data."""
-    match = re.search('^\s+kernel (.+?)$', data, re.MULTILINE)
+    match = re.search(r'^\s+kernel (.+?)$', data, re.MULTILINE)
     return match.group(0)
 
 
@@ -204,7 +204,7 @@ def get_grub_root(target):
             ]).encode('utf-8')
         out, err = in_chroot(['grub', '--batch'],
                              data=data, capture=True)
-        regex = re.search('^\s+(\(.+?\))$', out, re.MULTILINE)
+        regex = re.search(r'^\s+(\(.+?\))$', out, re.MULTILINE)
         return regex.groups()[0]
 
 
diff --git a/meph2/commands/dpkg.py b/meph2/commands/dpkg.py
index 47ab883..b2e1467 100644
--- a/meph2/commands/dpkg.py
+++ b/meph2/commands/dpkg.py
@@ -84,7 +84,7 @@ def get_packages(base_url, component, architecture, pkg_name):
     pkg_data = geturl(packages_url)
     regex_path = re.escape(path)
     sha256sum = re.search(
-        ("^\s*?([a-fA-F0-9]{64})\s*[0-9]+\s+%s$" % regex_path).encode('utf-8'),
+        (r"^\s*?([a-fA-F0-9]{64})\s*[0-9]+\s+%s$" % regex_path).encode('utf-8'),
         release_file,
         re.MULTILINE).group(1)
     if get_sha256(pkg_data).encode('utf-8') != sha256sum: