From 79f2f8dec70d9df7a54f75d5688c761d84352db6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 14 Oct 2018 13:58:04 +0100 Subject: [PATCH] Escape: Add missing r in regexp literals ('...' => r'...') [6] Detected by flake8, eg ./gbp/deb/git.py:35:6: W605 invalid escape sequence '\)' Signed-off-by: Ian Jackson --- gbp/deb/policy.py | 4 ++-- gbp/deb/pristinetar.py | 4 ++-- gbp/scripts/dch.py | 2 +- gbp/scripts/export_orig.py | 2 +- gbp/scripts/pq.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gbp/deb/policy.py b/gbp/deb/policy.py index d9b27ac..89a4c6d 100644 --- a/gbp/deb/policy.py +++ b/gbp/deb/policy.py @@ -43,7 +43,7 @@ class DebianPkgPolicy(PkgPolicy): # must consist only of lower case letters (a-z), digits (0-9), plus (+) # and minus (-) signs, and periods (.). They must be at least two # characters long and must start with an alphanumeric character." - packagename_re = re.compile("^[a-zA-Z0-9][a-zA-Z0-9\.\+\-~]+$") + packagename_re = re.compile(r"^[a-zA-Z0-9][a-zA-Z0-9\.\+\-~]+$") packagename_msg = """Package names must be at least two characters long, start with an alphanumeric and can only containg letters (a-z,A-Z), digits (0-9), plus signs (+), minus signs (-), periods (.) and hyphens (~)""" @@ -55,7 +55,7 @@ class DebianPkgPolicy(PkgPolicy): # are not allowed; if there is no epoch then colons are not allowed." # Since we don't know about any epochs and debian revisions yet, the # last two conditions are not checked. - upstreamversion_re = re.compile("^[0-9][a-zA-Z0-9\.\+\-\:\~]*$") + upstreamversion_re = re.compile(r"^[0-9][a-zA-Z0-9\.\+\-\:\~]*$") upstreamversion_msg = """Upstream version numbers must start with a digit and can only containg lower case letters (a-z), digits (0-9), full stops (.), plus signs (+), minus signs (-), colons (:) and tildes (~)""" diff --git a/gbp/deb/pristinetar.py b/gbp/deb/pristinetar.py index 2f52f3a..843e52e 100644 --- a/gbp/deb/pristinetar.py +++ b/gbp/deb/pristinetar.py @@ -36,11 +36,11 @@ class DebianPristineTar(PristineTar): @type comp_type: C{str} """ if not comp_type: - ext = '\w\+' + ext = r'\w\+' else: ext = Compressor.Exts[comp_type] - name_regexp = '%s_%s\.orig\.tar\.%s' % (package, version, ext) + name_regexp = r'%s_%s\.orig\.tar\.%s' % (package, version, ext) return super(DebianPristineTar, self).has_commit(name_regexp) diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py index 6297d2d..2584eff 100644 --- a/gbp/scripts/dch.py +++ b/gbp/scripts/dch.py @@ -34,7 +34,7 @@ from gbp.scripts.common import ExitCodes, maybe_debug_raise from gbp.scripts.common.hook import Hook user_customizations = {} -snapshot_re = re.compile("\s*\*\* SNAPSHOT build @(?P[a-z0-9]+)\s+\*\*") +snapshot_re = re.compile(r"\s*\*\* SNAPSHOT build @(?P[a-z0-9]+)\s+\*\*") def guess_version_from_upstream(repo, upstream_tag_format, upstream_branch, cp=None): diff --git a/gbp/scripts/export_orig.py b/gbp/scripts/export_orig.py index ea6c887..1afbe6d 100755 --- a/gbp/scripts/export_orig.py +++ b/gbp/scripts/export_orig.py @@ -235,7 +235,7 @@ def guess_comp_type(comp_type, source, repo, tarball_dir): if comp_type == 'auto': if repo and repo.has_pristine_tar_branch(): - regex = 'pristine-tar .* %s_%s\.orig.tar\.' % (source.name, source.upstream_version) + regex = r'pristine-tar .* %s_%s\.orig.tar\.' % (source.name, source.upstream_version) commits = repo.grep_log(regex, repo.pristine_tar_branch, merges=False) if commits: commit = commits[-1] diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py index 7bf7736..babff1c 100755 --- a/gbp/scripts/pq.py +++ b/gbp/scripts/pq.py @@ -48,7 +48,7 @@ def parse_old_style_topic(commit_info): """Parse 'gbp-pq-topic:' line(s) from commit info""" commit = commit_info['id'] - topic_regex = 'gbp-pq-topic:\s*(?P\S.*)' + topic_regex = r'gbp-pq-topic:\s*(?P\S.*)' mangled_body = '' topic = '' # Parse and filter commit message body -- 2.30.2