summaryrefslogtreecommitdiffstats
path: root/gluster/swift/common/middleware/gswauth/swauth/middleware.py
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/common/middleware/gswauth/swauth/middleware.py
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/common/middleware/gswauth/swauth/middleware.py')
-rw-r--r--gluster/swift/common/middleware/gswauth/swauth/middleware.py4
1 files changed, 2 insertions, 2 deletions
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):