summaryrefslogtreecommitdiffstats
path: root/gluster/swift
diff options
context:
space:
mode:
authorPrashanth Pai <ppai@redhat.com>2016-01-28 18:10:04 +0530
committerPrashanth Pai <ppai@redhat.com>2016-03-07 22:23:54 -0800
commit7392f4626609da910a2c98c14b8380419613635d (patch)
tree99248f322ff32d53dd12c9e4d4a81e5e996d83e9 /gluster/swift
parentd7af577eb42e4c8bbdcadbb45a46d3a37c98193e (diff)
Fix pep8 and functests
Functests used to fail with higher version of python-eventlet (from EPEL repo) package on rhel6. This change addresses that and also some pep8 issues. BUG: 1302546 Change-Id: I5a1a1deb94ee712a387af3d6f65afbcb8557ab6f Signed-off-by: Prashanth Pai <ppai@redhat.com> Reviewed-on: http://review.gluster.org/13636
Diffstat (limited to 'gluster/swift')
-rwxr-xr-xgluster/swift/common/middleware/gswauth/bin/gswauth-add-account2
-rwxr-xr-xgluster/swift/common/middleware/gswauth/bin/gswauth-add-user4
-rwxr-xr-xgluster/swift/common/middleware/gswauth/bin/gswauth-cleanup-tokens4
-rwxr-xr-xgluster/swift/common/middleware/gswauth/bin/gswauth-delete-account2
-rwxr-xr-xgluster/swift/common/middleware/gswauth/bin/gswauth-delete-user2
-rwxr-xr-xgluster/swift/common/middleware/gswauth/bin/gswauth-list2
-rwxr-xr-xgluster/swift/common/middleware/gswauth/bin/gswauth-prep2
-rwxr-xr-xgluster/swift/common/middleware/gswauth/bin/gswauth-set-account-service2
-rw-r--r--gluster/swift/common/middleware/gswauth/swauth/middleware.py4
9 files changed, 12 insertions, 12 deletions
diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-add-account b/gluster/swift/common/middleware/gswauth/bin/gswauth-add-account
index d3fd243..f382232 100755
--- a/gluster/swift/common/middleware/gswauth/bin/gswauth-add-account
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-add-account
@@ -64,7 +64,7 @@ if __name__ == '__main__':
except socket.gaierror, err:
exit('Account creation failed: %s. ' \
'Check that the admin_url is valid' % err)
- except socket.error, (errno, msg):
+ except socket.error, msg:
exit('Account creation failed: %s. ' \
'Check that the admin_url is valid' % msg)
diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-add-user b/gluster/swift/common/middleware/gswauth/bin/gswauth-add-user
index 0eb2e9c..27b4a4c 100755
--- a/gluster/swift/common/middleware/gswauth/bin/gswauth-add-user
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-add-user
@@ -90,7 +90,7 @@ if __name__ == '__main__':
except socket.gaierror, err:
exit('User creation failed: %s. ' \
'Check that the admin_url is valid' % err)
- except socket.error, (errno, msg):
+ except socket.error, msg:
exit('User creation failed: %s. ' \
'Check that the admin_url is valid' % msg)
@@ -111,7 +111,7 @@ if __name__ == '__main__':
except socket.gaierror, err:
exit('User creation failed: %s. ' \
'Check that the admin_url is valid' % err)
- except socket.error, (errno, msg):
+ except socket.error, msg:
exit('User creation failed: %s. ' \
'Check that the admin_url is valid' % msg)
diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-cleanup-tokens b/gluster/swift/common/middleware/gswauth/bin/gswauth-cleanup-tokens
index f73c8b1..75420a4 100755
--- a/gluster/swift/common/middleware/gswauth/bin/gswauth-cleanup-tokens
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-cleanup-tokens
@@ -94,7 +94,7 @@ if __name__ == '__main__':
else:
exit('Purging %s failed with status '
'code %d' % (options.purge_account, e.http_status))
- except socket.error, (errno, msg):
+ except socket.error, msg:
exit('Token clean-up failed: %s. ' \
'Check that the admin_url is valid' % msg)
if objs:
@@ -141,7 +141,7 @@ if __name__ == '__main__':
else:
exit('Object listing on container %s failed with status '
'code %d' % (container, e.http_status))
- except socket.error, (errno, msg):
+ except socket.error, msg:
exit('Token clean-up failed: %s. ' \
'Check that the admin_url is valid' % msg)
diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-account b/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-account
index 204bb95..f297b29 100755
--- a/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-account
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-account
@@ -65,7 +65,7 @@ if __name__ == '__main__':
except socket.gaierror, err:
exit('Account deletion failed: %s. ' \
'Check that the admin_url is valid' % err)
- except socket.error, (errno, msg):
+ except socket.error, msg:
exit('Account deletion failed: %s. ' \
'Check that the admin_url is valid' % msg)
diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-user b/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-user
index 5e56a79..5996cd1 100755
--- a/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-user
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-user
@@ -65,7 +65,7 @@ if __name__ == '__main__':
except socket.gaierror, err:
exit('User deletion failed: %s. ' \
'Check that the admin_url is valid' % err)
- except socket.error, (errno, msg):
+ except socket.error, msg:
exit('User deletion failed: %s. ' \
'Check that the admin_url is valid' % msg)
diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-list b/gluster/swift/common/middleware/gswauth/bin/gswauth-list
index 50b7936..f0372ef 100755
--- a/gluster/swift/common/middleware/gswauth/bin/gswauth-list
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-list
@@ -88,7 +88,7 @@ If the [user] is '.groups', the active groups for the account will be listed.
except socket.gaierror, err:
exit('List failed: %s. ' \
'Check that the admin_url is valid' % err)
- except socket.error, (errno, msg):
+ except socket.error, msg:
exit('List failed: %s. ' \
'Check that the admin_url is valid' % msg)
diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-prep b/gluster/swift/common/middleware/gswauth/bin/gswauth-prep
index a73aa1d..d3af200 100755
--- a/gluster/swift/common/middleware/gswauth/bin/gswauth-prep
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-prep
@@ -62,7 +62,7 @@ if __name__ == '__main__':
except socket.gaierror, err:
exit('gswauth preparation failed: %s. ' \
'Check that the admin_url is valid' % err)
- except socket.error, (errno, msg):
+ except socket.error, msg:
exit('gswauth preparation failed: %s. ' \
'Check that the admin_url is valid' % msg)
diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-set-account-service b/gluster/swift/common/middleware/gswauth/bin/gswauth-set-account-service
index 426ce3c..faea8ca 100755
--- a/gluster/swift/common/middleware/gswauth/bin/gswauth-set-account-service
+++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-set-account-service
@@ -75,7 +75,7 @@ Example: %prog -K gswauthkey test storage local http://127.0.0.1:8080/v1/AUTH_01
except socket.gaierror, err:
exit('Service set failed: %s. ' \
'Check that the admin_url is valid' % err)
- except socket.error, (errno, msg):
+ except socket.error, msg:
exit('Service set failed: %s. ' \
'Check that the admin_url is valid' % msg)
if resp.status // 100 != 2:
diff --git a/gluster/swift/common/middleware/gswauth/swauth/middleware.py b/gluster/swift/common/middleware/gswauth/swauth/middleware.py
index 3cd9cf7..a77e038 100644
--- a/gluster/swift/common/middleware/gswauth/swauth/middleware.py
+++ b/gluster/swift/common/middleware/gswauth/swauth/middleware.py
@@ -1602,8 +1602,8 @@ class Swauth(object):
getattr(req, 'bytes_transferred', 0) or '-',
getattr(response, 'bytes_transferred', 0) or '-',
req.headers.get('etag', '-'),
- req.headers.get('x-trans-id', '-'), logged_headers
- or '-', trans_time)))
+ req.headers.get('x-trans-id', '-'),
+ logged_headers or '-', trans_time)))
def filter_factory(global_conf, **local_conf):