From 86355b266703815a8334b38751c55b23bffe2a6e Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Aug 20 2019 17:03:48 +0000 Subject: Use raw strings for regular expressions. This will avoid deprecation warnings / errors about invalid escape sequences in strings that comes about in newer Python 3. --- diff --git a/r2spec/r2spec_obj.py b/r2spec/r2spec_obj.py index 43e73dc..b826c2b 100644 --- a/r2spec/r2spec_obj.py +++ b/r2spec/r2spec_obj.py @@ -236,7 +236,7 @@ class R2spec(object): settings.set('email', args.email) if args.package: - pack = RPackage(re.sub('^R-', '', args.package)) + pack = RPackage(re.sub(r'^R-', '', args.package)) pack.search_package_in_repo() elif args.url: pack = RPackage(source0=args.url) @@ -331,7 +331,7 @@ class R2rpm(R2spec): specfile = '' if args.package: - self.pack.name = re.sub('^R-', '', args.package) + self.pack.name = re.sub(r'^R-', '', args.package) self.spec.package = self.pack specfile = self.spec.get_specfile() self.pack.search_package_in_repo() diff --git a/r2spec/rpackage.py b/r2spec/rpackage.py index ce6627a..a4a0f9b 100644 --- a/r2spec/rpackage.py +++ b/r2spec/rpackage.py @@ -55,11 +55,11 @@ def package_in_repo(url, name): stream = urllib_request.urlopen(url) content = stream.read().decode() stream.close() - sourcemotif = re.compile("Package:\s+%s\n" % name) + sourcemotif = re.compile(r"Package:\s+%s\n" % name) result = sourcemotif.search(content) if result is not None: log.info("Package found in : %s" % url) - versionmotif = re.compile("Package:\s+%s\nVersion:(.*)" % name) + versionmotif = re.compile(r"Package:\s+%s\nVersion:(.*)" % name) version = versionmotif.search(content).group(1).strip() return (version) else: @@ -189,7 +189,7 @@ class RPackage(object): key = None for row in content.split('\n'): if row.strip(): - pattern = re.compile("\w:*") + pattern = re.compile(r"\w:*") if pattern.match(row): key, value = row.split(':', 1) self.description[key.strip()] = value.strip() diff --git a/r2spec/spec.py b/r2spec/spec.py index 817718f..351379b 100644 --- a/r2spec/spec.py +++ b/r2spec/spec.py @@ -37,7 +37,7 @@ def format_dependencies(dependencies): ignorelist = ['R'] # Regular expression used to determine whether the string is a # version number - versionmotif = re.compile('\d\.\d\.?\d?') + versionmotif = re.compile(r'\d\.\d\.?\d?') char = { '\r': '', '(': ' ',