From e36c940ba7a56c01c1df89fa282206bf19712c4c Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 31 Mar 2020 13:34:23 +0200
Subject: [PATCH] Update hacking for Python3

The repo is Python 3 now, so update hacking to version 3.0 which
supports Python 3.

Fix problems found.

Change-Id: Ic78f1a2f958530fe7e480c7043c604d9f0e978c3
---
 searchlightclient/common/utils.py                  | 4 ++--
 searchlightclient/osc/v1/search.py                 | 2 +-
 searchlightclient/tests/unit/osc/v1/test_search.py | 2 +-
 test-requirements.txt                              | 2 +-
 tools/install_venv.py                              | 3 ++-
 tox.ini                                            | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/searchlightclient/common/utils.py b/searchlightclient/common/utils.py
index 92074a2..f7d6bcb 100644
--- a/searchlightclient/common/utils.py
+++ b/searchlightclient/common/utils.py
@@ -245,8 +245,8 @@ def format_parameter_file(param_files, template_file=None,
 
     param_file = {}
     for key, value in iter(params.items()):
-                param_file[key] = resolve_param_get_file(value,
-                                                         template_base_url)
+        param_file[key] = resolve_param_get_file(value,
+                                                 template_base_url)
     return param_file
 
 
diff --git a/searchlightclient/osc/v1/search.py b/searchlightclient/osc/v1/search.py
index c5f1e55..447da5e 100644
--- a/searchlightclient/osc/v1/search.py
+++ b/searchlightclient/osc/v1/search.py
@@ -133,4 +133,4 @@ class SearchResource(command.Lister):
         return (columns, result)
 
     def _modify_query_string(self, query_string):
-        return query_string.replace('/', '\/')
+        return query_string.replace(r'/', r'\/')
diff --git a/searchlightclient/tests/unit/osc/v1/test_search.py b/searchlightclient/tests/unit/osc/v1/test_search.py
index 7096d92..e8b2ceb 100644
--- a/searchlightclient/tests/unit/osc/v1/test_search.py
+++ b/searchlightclient/tests/unit/osc/v1/test_search.py
@@ -87,7 +87,7 @@ class TestSearchResource(TestSearch):
     def test_search_regexp_slashes_in_query_string(self):
         """Escape slashes in querystrings so not to be treated as regexp"""
         self._test_search(["this/has/some/slashes"],
-            query={"query_string": {"query": "this\/has\/some\/slashes"}},
+            query={"query_string": {"query": r"this\/has\/some\/slashes"}},
             _source=['id', 'name', 'updated_at'],
             all_projects=False, type=None)
 
diff --git a/test-requirements.txt b/test-requirements.txt
index 3298d05..608180e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=1.1.0,<1.2.0 # Apache-2.0
+hacking>=3.0,<3.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 mock>=2.0.0 # BSD
diff --git a/tools/install_venv.py b/tools/install_venv.py
index cc21843..b5b5309 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -42,7 +42,7 @@ def print_help(project, venv, root):
 
     $ %(root)s/tools/with_venv.sh <your command>
     """
-    print help % dict(project=project, venv=venv, root=root)
+    print(help % dict(project=project, venv=venv, root=root))
 
 
 def main(argv):
@@ -70,5 +70,6 @@ def main(argv):
     install.install_dependencies()
     print_help(project, venv, root)
 
+
 if __name__ == '__main__':
     main(sys.argv)
diff --git a/tox.ini b/tox.ini
index d8b154c..e1e7272 100644
--- a/tox.ini
+++ b/tox.ini
@@ -65,7 +65,7 @@ commands =
   make -C doc/build/pdf
 
 [flake8]
-ignore = E123,E126,E128,E241,E265,E713,H202,H405,H238
+ignore = E123,E126,E128,E241,E265,E713,H202,H405,H238,W504
 show-source = True
 exclude=.venv,.git,.tox,dist,*lib/python*,*egg,build
 max-complexity=20