]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Fix flake8 "invalid escape sequence 'x'" warning
authorBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 25 Oct 2018 06:26:08 +0000 (23:26 -0700)
committerGitHub <noreply@github.com>
Thu, 25 Oct 2018 06:26:08 +0000 (23:26 -0700)
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 <john.kennedy@delphix.com>
Reviewed-by: Richard Elling <Richard.Elling@RichardElling.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #8056

cmd/arcstat/arcstat.py
tests/test-runner/bin/zts-report.py

index b52a8c29477cb84c0017f4815865e2c6271b0842..d7d3e9b731305227f0b08b1a0d8dca6a06f08bcd 100755 (executable)
@@ -112,7 +112,6 @@ cur = {}
 d = {}
 out = None
 kstat = None
-float_pobj = re.compile("^[0-9]+(\.[0-9]+)?$")
 
 
 def detailed_usage():
index efee5d989bcfcef895c4e6241e4de2719f601235..8b58950b8d105980b64743eaed8bfaea6ffcbe68 100755 (executable)
@@ -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():