From b74f48fe1b15b4958da35413edd89060df7a1c30 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 24 Oct 2018 23:26:08 -0700 Subject: [PATCH] Fix flake8 "invalid escape sequence 'x'" warning From, https://lintlyci.github.io/Flake8Rules/rules/W605.html As of Python 3.6, a backslash-character pair that is not a valid escape sequence now generates a DeprecationWarning. Although this will eventually become a SyntaxError, that will not be for several Python releases. Note 'float_pobj' was simply removed from arcstat.py since it was entirely unused. Reviewed-by: John Kennedy Reviewed-by: Richard Elling Signed-off-by: Brian Behlendorf Closes #8056 --- cmd/arcstat/arcstat.py | 1 - tests/test-runner/bin/zts-report.py | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/arcstat/arcstat.py b/cmd/arcstat/arcstat.py index b52a8c2947..d7d3e9b731 100755 --- a/cmd/arcstat/arcstat.py +++ b/cmd/arcstat/arcstat.py @@ -112,7 +112,6 @@ cur = {} d = {} out = None kstat = None -float_pobj = re.compile("^[0-9]+(\.[0-9]+)?$") def detailed_usage(): diff --git a/tests/test-runner/bin/zts-report.py b/tests/test-runner/bin/zts-report.py index efee5d989b..8b58950b8d 100755 --- a/tests/test-runner/bin/zts-report.py +++ b/tests/test-runner/bin/zts-report.py @@ -292,9 +292,10 @@ def process_results(pathname): sys.exit(1) prefix = '/zfs-tests/tests/functional/' - pattern = '^Test:\s*\S*%s(\S+)\s*\(run as (\S+)\)\s*\[(\S+)\]\s*\[(\S+)\]'\ + pattern = \ + r'^Test:\s*\S*%s(\S+)\s*\(run as (\S+)\)\s*\[(\S+)\]\s*\[(\S+)\]' \ % prefix - pattern_log = '^\s*Log directory:\s*(\S*)' + pattern_log = r'^\s*Log directory:\s*(\S*)' d = {} for l in f.readlines():