From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 25 Oct 2018 06:26:08 +0000 (-0700)
Subject: Fix flake8 "invalid escape sequence 'x'" warning
X-Git-Tag: zfs-0.8.0-rc2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b74f48fe1b15b4958da35413edd89060df7a1c30;p=zfs

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 <john.kennedy@delphix.com>
Reviewed-by: Richard Elling <Richard.Elling@RichardElling.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #8056
---

diff --git a/cmd/arcstat/arcstat.py b/cmd/arcstat/arcstat.py
index b52a8c294..d7d3e9b73 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 efee5d989..8b58950b8 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():