aboutsummaryrefslogtreecommitdiffhomepage
path: root/gbp/deb
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2018-10-14 11:17:43 +0200
committerGuido Günther <agx@sigxcpu.org>2018-10-15 10:15:08 +0200
commit6b1342253eecd83e514400fccc531205450b13d3 (patch)
tree44180789a4991c356740dbd2212b548ec35e7368 /gbp/deb
parent497addcb69ddb53199c75d29004239e1cbb8495a (diff)
Fix flake8's W605 (invalid escape sequence)
See also https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior
Diffstat (limited to 'gbp/deb')
-rw-r--r--gbp/deb/dscfile.py12
-rw-r--r--gbp/deb/git.py18
-rw-r--r--gbp/deb/policy.py4
-rw-r--r--gbp/deb/pristinetar.py4
4 files changed, 19 insertions, 19 deletions
diff --git a/gbp/deb/dscfile.py b/gbp/deb/dscfile.py
index 76676fc6..41ab869e 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 7e87eda0..fa865ee2 100644
--- a/gbp/deb/git.py
+++ b/gbp/deb/git.py
@@ -33,9 +33,9 @@ class DebianGitRepository(PkgGitRepository):
"""A git repository that holds the source of a Debian package"""
version_mangle_re = (r'%\(version'
- '%(?P<M>[^%])'
- '%(?P<R>([^%]|\\%))+'
- '\)s')
+ r'%(?P<M>[^%])'
+ r'%(?P<R>([^%]|\\%))+'
+ r'\)s')
def __init__(self, *args, **kwargs):
super(DebianGitRepository, self).__init__(*args, **kwargs)
@@ -166,7 +166,7 @@ class DebianGitRepository(PkgGitRepository):
'libfoo-1-8-1'
>>> DebianGitRepository.version_to_tag("v%(version%.%_)s", "1.2.3")
'v1_2_3'
- >>> DebianGitRepository.version_to_tag("%(version%-%\%)s", "0-1.2.3")
+ >>> DebianGitRepository.version_to_tag(r'%(version%-%\\%)s', "0-1.2.3")
'0%1.2.3'
"""
f, v = cls._mangle_version(format, version)
@@ -178,13 +178,13 @@ class DebianGitRepository(PkgGitRepository):
"""
Basic version mangling to replce single characters
- >>> DebianGitRepository._mangle_version("%(version%-%\%)s", "0-1.2.3")
+ >>> DebianGitRepository._mangle_version(r'%(version%-%\\%)s', "0-1.2.3")
('%(version)s', '0%1.2.3')
"""
r = re.search(cls.version_mangle_re, format)
if r:
f = re.sub(cls.version_mangle_re, "%(version)s", format)
- v = version.replace(r.group('M'), r.group('R').replace('\%', '%'))
+ v = version.replace(r.group('M'), r.group('R').replace(r'\%', '%'))
return f, v
else:
return format, version
@@ -207,7 +207,7 @@ class DebianGitRepository(PkgGitRepository):
"""
r = re.search(cls.version_mangle_re, format)
if r:
- v = tag.replace(r.group('R').replace('\%', '%'), r.group('M'))
+ v = tag.replace(r.group('R').replace(r'\%', '%'), r.group('M'))
return v
else:
return tag
@@ -231,7 +231,7 @@ class DebianGitRepository(PkgGitRepository):
>>> DebianGitRepository._sanitize_version("0.lock")
'0.#lock'
"""
- v = re.sub('\.(?=\.|$|lock$)', '.#', version)
+ v = re.sub(r'\.(?=\.|$|lock$)', '.#', version)
return v.replace('~', '_').replace(':', '%')
@staticmethod
@@ -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'))
diff --git a/gbp/deb/policy.py b/gbp/deb/policy.py
index d9b27ac0..6664f4ff 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 2f52f3ac..843e52e9 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)