summaryrefslogtreecommitdiff
path: root/test/functional/__init__.py
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.com>2020-04-03 10:53:34 +0200
committerAndreas Jaeger <aj@suse.com>2020-04-03 21:21:07 +0200
commit96b56519bf5756022d495aedc0033cd44e0e3267 (patch)
tree243a21209a65fafb7e3402f35281b6bf049e7a18 /test/functional/__init__.py
parentb4b0ebd4aa0a710af288a69ae787e10420fdeb1a (diff)
downloadswift-96b56519bf5756022d495aedc0033cd44e0e3267.tar.gz
Update hacking for Python3
The repo is Python using both Python 2 and 3 now, so update hacking to version 2.0 which supports Python 2 and 3. Note that latest hacking release 3.0 only supports version 3. Fix problems found. Remove hacking and friends from lower-constraints, they are not needed for installation. Change-Id: I9bd913ee1b32ba1566c420973723296766d1812f
Diffstat (limited to 'test/functional/__init__.py')
-rw-r--r--test/functional/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/functional/__init__.py b/test/functional/__init__.py
index 4dda5f50d..c2d9c250c 100644
--- a/test/functional/__init__.py
+++ b/test/functional/__init__.py
@@ -248,7 +248,7 @@ def _in_process_setup_ring(swift_conf, conf_src_dir, testdir):
try:
ring_file_src = _in_process_find_conf_file(conf_src_dir, ring_file_src,
use_sample=False)
- except InProcessException as e:
+ except InProcessException:
if policy_specified:
raise InProcessException('Failed to find ring file %s'
% ring_file_src)
@@ -883,8 +883,8 @@ def setup_package():
# and we'll skip everything later
if 'service_prefix' in config:
- swift_test_service_prefix = utils.append_underscore(
- config['service_prefix'])
+ swift_test_service_prefix = utils.append_underscore(
+ config['service_prefix'])
if swift_test_auth_version == "1":