Merge ~cjwatson/ubuntu-archive-tools:flake8-W605 into ubuntu-archive-tools:main

[Colin Watson]

Fix "W605 invalid escape sequence" flake8 warnings

Unmerged commits

0dbb075... by Colin Watson on 2021-11-01

Fix "W605 invalid escape sequence" flake8 warnings

diff --git a/kernel_workflow.py b/kernel_workflow.py
index a211776..8f5a8f8 100644
--- a/kernel_workflow.py
+++ b/kernel_workflow.py
@@ -46,7 +46,7 @@ def process_sru_bug(lp, bugnum, task_callback, source_callback, context=None):
     """
     package_re = re.compile(
         (r'^%subuntu/(?P<release>[0-9a-z.-]+)/'
-         + '\+source/(?P<package>[a-z0-9.-]+)$') % str(lp._root_uri))
+         r'\+source/(?P<package>[a-z0-9.-]+)$') % str(lp._root_uri))
     workflow_re = re.compile(
         r'^%skernel-sru-workflow/(?P<subtask>.*)' % str(lp._root_uri))
     prep_re = re.compile(r'prepare-package(?P<subpackage>.*)')
diff --git a/publish-image-set b/publish-image-set
index e9669c3..4f1c3bc 100755
--- a/publish-image-set
+++ b/publish-image-set
@@ -40,21 +40,21 @@ import sys
 # See isotracker.py for setup instructions.
 from isotracker import ISOTracker
 
-milestone_name_re = re.compile('(Alpha|Beta|RC|Final|Pre-release)(?: (\d))?')
-stable_name_re = re.compile('(Xenial|Bionic|Focal) (16|18|20)\.04\.\d+')
+milestone_name_re = re.compile(r'(Alpha|Beta|RC|Final|Pre-release)(?: (\d))?')
+stable_name_re = re.compile(r'(Xenial|Bionic|Focal) (16|18|20)\.04\.\d+')
 
 # do not warn about not being able to handle those
 ignore_product_re = re.compile(
     'Netboot |Upgrade |Server EC2|Server Windows Azure|line-through|Ubuntu WSL')
 # this identifies known builds
 product_re = re.compile(
-    '((?:|u|lu|ku|edu|xu|myth)buntu(?: studio|kylin| kylin| gnome| mate| budgie| next)?) '
-    '(alternate|desktop|dvd|server(?: subiquity)?|mobile|base|active|wubi)(?: preinstalled)? '
-    '(i386|amd64$|amd64\+mac|armel$|armel\+dove|armel\+omap$|armel\+omap4|'
-    'armel\+ac100|armel\+mx5|armhf$|armhf\+omap$|armhf\+omap4|armhf\+ac100|'
-    'armhf\+mx5|armhf\+nexus7|armhf\+raspi$|armhf\+raspi2|armhf\+raspi3|'
-    'arm64$|arm64\+raspi$|arm64\+raspi3|powerpc|ppc64el|s390x|riscv64$|'
-    'riscv64\+unleashed|riscv64\+unmatched)', re.I)
+    r'((?:|u|lu|ku|edu|xu|myth)buntu(?: studio|kylin| kylin| gnome| mate| budgie| next)?) '
+    r'(alternate|desktop|dvd|server(?: subiquity)?|mobile|base|active|wubi)(?: preinstalled)? '
+    r'(i386|amd64$|amd64\+mac|armel$|armel\+dove|armel\+omap$|armel\+omap4|'
+    r'armel\+ac100|armel\+mx5|armhf$|armhf\+omap$|armhf\+omap4|armhf\+ac100|'
+    r'armhf\+mx5|armhf\+nexus7|armhf\+raspi$|armhf\+raspi2|armhf\+raspi3|'
+    r'arm64$|arm64\+raspi$|arm64\+raspi3|powerpc|ppc64el|s390x|riscv64$|'
+    r'riscv64\+unleashed|riscv64\+unmatched)', re.I)
 
 # map an image type from the ISO tracker to a source directory for
 # publish-release
diff --git a/queuediff b/queuediff
index 5719464..cc7c731 100755
--- a/queuediff
+++ b/queuediff
@@ -98,11 +98,11 @@ def from_queue(sourcepkg, release):
     '''
     oops_re = re.compile('class="oopsid">(OOPS[a-zA-Z0-9-]+)<')
     changes_re = re.compile(
-        'href="(http://launchpadlibrarian.net/\d+/%s_[^"]+_source.changes)"' %
+        r'href="(http://launchpadlibrarian.net/\d+/%s_[^"]+_source.changes)"' %
         re.escape(quote(sourcepkg)))
     debdiff_re = re.compile(
-        'href="(http://launchpadlibrarian.net/'
-        '\d+/%s_[^"_]+_[^_"]+\.diff\.gz)">\s*diff from' %
+        r'href="(http://launchpadlibrarian.net/'
+        r'\d+/%s_[^"_]+_[^_"]+\.diff\.gz)">\s*diff from' %
         re.escape(quote(sourcepkg)))
 
     queue_html = urlopen(queue_url % release).read()
@@ -141,7 +141,7 @@ def from_ppa(sourcepkg, release, user, ppaname):
         'href="(https://launchpad.net/[^ "]+/%s_[^"]+_source.changes)"' %
         re.escape(quote(sourcepkg)))
     sourcepub_re = re.compile(
-        'href="(\+sourcepub/\d+/\+listing-archive-extra)"')
+        r'href="(\+sourcepub/\d+/\+listing-archive-extra)"')
     #debdiff_re = re.compile(
     #    'href="(https://launchpad.net/.[^ "]+.diff.gz)">diff from')
 
diff --git a/sru-review b/sru-review
index 0f55d5d..2682727 100755
--- a/sru-review
+++ b/sru-review
@@ -217,8 +217,8 @@ def from_queue(options, archive, sourcepkg, series, version=None):
             else:
                 re_version = '[^_"]+'
             debdiff_re = re.compile(
-                'href="(http://launchpadlibrarian.net/'
-                '\d+/%s_[^"_]+_%s\.diff\.gz)">\s*diff from' %
+                r'href="(http://launchpadlibrarian.net/'
+                r'\d+/%s_[^"_]+_%s\.diff\.gz)">\s*diff from' %
                 (re.escape(sourcepkg), re_version))
 
             queue_html = urlopen(queue_url).read().decode('utf-8')
@@ -250,7 +250,7 @@ def from_ppa(options, sourcepkg, user, ppaname):
         'href="(https://launchpad.net/[^ "]+/%s_[^"]+_source.changes)"' %
         re.escape(sourcepkg))
     sourcepub_re = re.compile(
-        'href="(\+sourcepub/\d+/\+listing-archive-extra)"')
+        r'href="(\+sourcepub/\d+/\+listing-archive-extra)"')
     #debdiff_re = re.compile(
     #    'href="(https://launchpad.net/.[^ "]+.diff.gz)">diff from')