From ff90c0246e50cede0e2f5ed7da42cc87f0187e22 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 29 May 2018 13:51:47 +0200 Subject: [PATCH] fix PEP8 W605 invalid escape sequence Python 3.7 will get a lot stricter with escape sequences. They must be valid. * https://lintlyci.github.io/Flake8Rules/rules/W605.html * https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior --- fdroidserver/common.py | 12 ++++++------ fdroidserver/import.py | 2 +- fdroidserver/init.py | 4 ++-- fdroidserver/metadata.py | 4 ++-- fdroidserver/publish.py | 2 +- fdroidserver/signatures.py | 2 +- fdroidserver/stats.py | 6 +++--- fdroidserver/update.py | 4 ++-- tests/build.TestCase | 4 ++-- tests/common.TestCase | 2 +- tests/index.TestCase | 6 +++--- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 9fa01bbf..ec22d4ab 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -560,7 +560,7 @@ def clean_description(description): paragraph = re.sub('\r', '', paragraph) paragraph = re.sub('\n', ' ', paragraph) paragraph = re.sub(' {2,}', ' ', paragraph) - paragraph = re.sub('^\s*(\w)', r'\1', paragraph) + paragraph = re.sub(r'^\s*(\w)', r'\1', paragraph) returnstring += paragraph + '\n\n' return returnstring.rstrip('\n') @@ -575,8 +575,8 @@ def publishednameinfo(filename): return result -apk_release_filename = re.compile('(?P[a-zA-Z0-9_\.]+)_(?P[0-9]+)\.apk') -apk_release_filename_with_sigfp = re.compile('(?P[a-zA-Z0-9_\.]+)_(?P[0-9]+)_(?P[0-9a-f]{7})\.apk') +apk_release_filename = re.compile(r'(?P[a-zA-Z0-9_\.]+)_(?P[0-9]+)\.apk') +apk_release_filename_with_sigfp = re.compile(r'(?P[a-zA-Z0-9_\.]+)_(?P[0-9]+)_(?P[0-9a-f]{7})\.apk') def apk_parse_release_filename(apkname): @@ -2479,7 +2479,7 @@ def metadata_find_signing_files(appid, vercode): sigs = glob.glob(os.path.join(sigdir, '*.DSA')) + \ glob.glob(os.path.join(sigdir, '*.EC')) + \ glob.glob(os.path.join(sigdir, '*.RSA')) - extre = re.compile('(\.DSA|\.EC|\.RSA)$') + extre = re.compile(r'(\.DSA|\.EC|\.RSA)$') for sig in sigs: sf = extre.sub('.SF', sig) if os.path.isfile(sf): @@ -3011,9 +3011,9 @@ def write_to_config(thisconfig, key, value=None, config_file=None): # regex for finding and replacing python string variable # definitions/initializations - pattern = re.compile('^[\s#]*' + key + '\s*=\s*"[^"]*"') + pattern = re.compile(r'^[\s#]*' + key + r'\s*=\s*"[^"]*"') repl = key + ' = "' + value + '"' - pattern2 = re.compile('^[\s#]*' + key + "\s*=\s*'[^']*'") + pattern2 = re.compile(r'^[\s#]*' + key + r"\s*=\s*'[^']*'") repl2 = key + " = '" + value + "'" # If we replaced this line once, we make sure won't be a diff --git a/fdroidserver/import.py b/fdroidserver/import.py index 41ae0149..6d729646 100644 --- a/fdroidserver/import.py +++ b/fdroidserver/import.py @@ -32,7 +32,7 @@ from . import metadata from .exception import FDroidException -SETTINGS_GRADLE = re.compile('''include\s+['"]:([^'"]*)['"]''') +SETTINGS_GRADLE = re.compile(r'''include\s+['"]:([^'"]*)['"]''') # Get the repo type and address from the given web page. The page is scanned diff --git a/fdroidserver/init.py b/fdroidserver/init.py index 0ebc58b8..1be28922 100644 --- a/fdroidserver/init.py +++ b/fdroidserver/init.py @@ -39,7 +39,7 @@ def disable_in_config(key, value): '''write a key/value to the local config.py, then comment it out''' with open('config.py', 'r', encoding='utf8') as f: data = f.read() - pattern = '\n[\s#]*' + key + '\s*=\s*"[^"]*"' + pattern = r'\n[\s#]*' + key + r'\s*=\s*"[^"]*"' repl = '\n#' + key + ' = "' + value + '"' data = re.sub(pattern, repl, data) with open('config.py', 'w', encoding='utf8') as f: @@ -106,7 +106,7 @@ def main(): except KeyboardInterrupt: print('') sys.exit(1) - if re.match('^\s*$', s) is not None: + if re.match(r'^\s*$', s) is not None: test_config['sdk_path'] = default_sdk_path else: test_config['sdk_path'] = s diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 380a3dd8..8c9aa6d7 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -811,7 +811,7 @@ def get_default_app_info(metadatapath=None): if os.path.exists('AndroidManifest.xml'): manifestroot = fdroidserver.common.parse_xml('AndroidManifest.xml') else: - pattern = re.compile(""".*manifest\.srcFile\s+'AndroidManifest\.xml'.*""") + pattern = re.compile(r""".*manifest\.srcFile\s+'AndroidManifest\.xml'.*""") for root, dirs, files in os.walk(os.getcwd()): if 'build.gradle' in files: p = os.path.join(root, 'build.gradle') @@ -1036,7 +1036,7 @@ def write_yaml(mf, app): raise FDroidException('ruamel.yaml not instlled, can not write metadata.') from e if not ruamel.yaml.__version__: raise FDroidException('ruamel.yaml.__version__ not accessible. Please make sure a ruamel.yaml >= 0.13 is installed..') - m = re.match('(?P[0-9]+)\.(?P[0-9]+)\.(?P[0-9]+)(-.+)?', + m = re.match(r'(?P[0-9]+)\.(?P[0-9]+)\.(?P[0-9]+)(-.+)?', ruamel.yaml.__version__) if not m: raise FDroidException('ruamel.yaml version malfored, please install an upstream version of ruamel.yaml') diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py index c0dd55d3..fad7d00f 100644 --- a/fdroidserver/publish.py +++ b/fdroidserver/publish.py @@ -85,7 +85,7 @@ def read_fingerprints_from_keystore(): raise FDroidException('could not read keysotre {}'.format(config['keystore'])) realias = re.compile('Alias name: (?P.+)\n') - resha256 = re.compile('\s+SHA256: (?P[:0-9A-F]{95})\n') + resha256 = re.compile(r'\s+SHA256: (?P[:0-9A-F]{95})\n') fps = {} for block in p.output.split(('*' * 43) + '\n' + '*' * 43): s_alias = realias.search(block) diff --git a/fdroidserver/signatures.py b/fdroidserver/signatures.py index e104b483..83f2763b 100644 --- a/fdroidserver/signatures.py +++ b/fdroidserver/signatures.py @@ -57,7 +57,7 @@ def extract(options): sys.exit(1) # iterate over supplied APKs downlaod and extract them… - httpre = re.compile('https?:\/\/') + httpre = re.compile(r'https?:\/\/') for apk in options.APK: try: if os.path.isfile(apk): diff --git a/fdroidserver/stats.py b/fdroidserver/stats.py index 447e1819..9d6cbfdc 100644 --- a/fdroidserver/stats.py +++ b/fdroidserver/stats.py @@ -135,9 +135,9 @@ def main(): logging.info('Processing logs...') appscount = Counter() appsvercount = Counter() - logexpr = '(?P[.:0-9a-fA-F]+) - - \[(?P