From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Oct 2018 12:56:02 +0000 (+0100)
Subject: Escape: Add missing r in regexp literals ('...' => r'...') [5]
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=765053ab289b6016bb45e0c0688ac5d25768e158;p=git-buildpackage.git

Escape: Add missing r in regexp literals ('...' => r'...') [5]

Detected by flake8, eg
 ./gbp/deb/git.py:35:6: W605 invalid escape sequence '\)'

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/gbp/deb/dscfile.py b/gbp/deb/dscfile.py
index 76676fc..41ab869 100644
--- a/gbp/deb/dscfile.py
+++ b/gbp/deb/dscfile.py
@@ -29,19 +29,19 @@ class DscFile(object):
     compressions = r"(%s)" % '|'.join(DebianUpstreamSource.known_compressions())
     pkg_re = re.compile(r'Source:\s+(?P<pkg>.+)\s*')
     version_re = re.compile(r'Version:\s((?P<epoch>\d+)\:)?'
-                            '(?P<version>[%s]+)\s*$'
+                            r'(?P<version>[%s]+)\s*$'
                             % DebianPkgPolicy.debianversion_chars)
     tar_re = re.compile(r'^\s\w+\s\d+\s+(?P<tar>[^_]+_[^_]+'
-                        '(\.orig)?\.tar\.%s)$' % compressions)
+                        r'(\.orig)?\.tar\.%s)$' % compressions)
     add_tar_re = re.compile(r'^\s\w+\s\d+\s+(?P<tar>[^_]+_[^_]+'
-                            '\.orig-(?P<dir>[a-zA-Z0-9-]+)\.tar\.%s)$' % compressions)
+                            r'\.orig-(?P<dir>[a-zA-Z0-9-]+)\.tar\.%s)$' % compressions)
     diff_re = re.compile(r'^\s\w+\s\d+\s+(?P<diff>[^_]+_[^_]+'
-                         '\.diff.(gz|bz2))$')
+                         r'\.diff.(gz|bz2))$')
     deb_tgz_re = re.compile(r'^\s\w+\s\d+\s+(?P<deb_tgz>[^_]+_[^_]+'
-                            '\.debian.tar.%s)$' % compressions)
+                            r'\.debian.tar.%s)$' % compressions)
     format_re = re.compile(r'Format:\s+(?P<format>[0-9.]+)\s*')
     sig_re = re.compile(r'^\s\w+\s\d+\s+(?P<sig>[^_]+_[^_]+'
-                        '\.orig(-[a-z0-9-]+)?\.tar\.%s.asc)$' % compressions)
+                        r'\.orig(-[a-z0-9-]+)?\.tar\.%s.asc)$' % compressions)
 
     def __init__(self, dscfile):
         self.pkg = ""
diff --git a/gbp/deb/git.py b/gbp/deb/git.py
index 8272385..bdd5af8 100644
--- a/gbp/deb/git.py
+++ b/gbp/deb/git.py
@@ -262,7 +262,7 @@ class DebianGitRepository(PkgGitRepository):
         >>> DebianGitRepository.tag_to_version("foo/2.3.4", "upstream/%(version)s")
         """
         f = cls._unmangle_format(format)
-        version_re = f.replace('%(version)s', '(?P<version>[\w_%+-.#]+)')
+        version_re = f.replace('%(version)s', r'(?P<version>[\w_%+-.#]+)')
         r = re.match(version_re, tag)
         if r:
             v = cls._unsanitize_version(r.group('version'))