From be74d9e773815a6f1dc36099def5358054dc000d Mon Sep 17 00:00:00 2001
From: gholt <gholt@rackspace.com>
Date: Sat, 16 Apr 2011 01:58:08 +0000
Subject: [PATCH] PEP8 Fixes

---
 swift/common/middleware/swauth.py |  4 ++--
 swift/common/middleware/swift3.py |  2 +-
 swift/proxy/server.py             | 14 ++++++++------
 swift/stats/log_processor.py      |  4 ++--
 swift/stats/log_uploader.py       |  3 ++-
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/swift/common/middleware/swauth.py b/swift/common/middleware/swauth.py
index d4df1aa7ab..328799a19a 100644
--- a/swift/common/middleware/swauth.py
+++ b/swift/common/middleware/swauth.py
@@ -468,7 +468,7 @@ class Swauth(object):
 
              {"account_id": "AUTH_018c3946-23f8-4efb-a8fb-b67aae8e4162",
               "services": {"storage": {"default": "local",
-                                       "local": "http://127.0.0.1:8080/v1/AUTH_018c3946-23f8-4efb-a8fb-b67aae8e4162"}},
+                           "local": "http://127.0.0.1:8080/v1/AUTH_018c3946"}},
               "users": [{"name": "tester"}, {"name": "tester3"}]}
 
         :param req: The webob.Request to process.
@@ -522,7 +522,7 @@ class Swauth(object):
         this::
 
               "services": {"storage": {"default": "local",
-                                       "local": "http://127.0.0.1:8080/v1/AUTH_018c3946-23f8-4efb-a8fb-b67aae8e4162"}}
+                            "local": "http://127.0.0.1:8080/v1/AUTH_018c3946"}}
 
         Making use of this section is described in :func:`handle_get_token`.
 
diff --git a/swift/common/middleware/swift3.py b/swift/common/middleware/swift3.py
index a41c8cb695..b739f2271e 100644
--- a/swift/common/middleware/swift3.py
+++ b/swift/common/middleware/swift3.py
@@ -239,7 +239,7 @@ class BucketController(Controller):
 
         if 'acl' in args:
             return get_acl(self.account_name)
-        
+
         objects = loads(''.join(list(body_iter)))
         body = ('<?xml version="1.0" encoding="UTF-8"?>'
             '<ListBucketResult '
diff --git a/swift/proxy/server.py b/swift/proxy/server.py
index d04664d13b..a8c5d26fd1 100644
--- a/swift/proxy/server.py
+++ b/swift/proxy/server.py
@@ -1325,8 +1325,8 @@ class AccountController(Controller):
             if value[0].lower().startswith('x-account-meta-'))
         if self.app.memcache:
             self.app.memcache.delete('account%s' % req.path_info.rstrip('/'))
-        return self.make_requests(req, self.app.account_ring, account_partition,
-                    'PUT', req.path_info, [headers] * len(accounts))
+        return self.make_requests(req, self.app.account_ring,
+            account_partition, 'PUT', req.path_info, [headers] * len(accounts))
 
     @public
     def POST(self, req):
@@ -1342,8 +1342,9 @@ class AccountController(Controller):
             if value[0].lower().startswith('x-account-meta-'))
         if self.app.memcache:
             self.app.memcache.delete('account%s' % req.path_info.rstrip('/'))
-        return self.make_requests(req, self.app.account_ring, account_partition,
-                    'POST', req.path_info, [headers] * len(accounts))
+        return self.make_requests(req, self.app.account_ring,
+            account_partition, 'POST', req.path_info,
+            [headers] * len(accounts))
 
     @public
     def DELETE(self, req):
@@ -1356,8 +1357,9 @@ class AccountController(Controller):
                    'X-CF-Trans-Id': self.trans_id}
         if self.app.memcache:
             self.app.memcache.delete('account%s' % req.path_info.rstrip('/'))
-        return self.make_requests(req, self.app.account_ring, account_partition,
-                    'DELETE', req.path_info, [headers] * len(accounts))
+        return self.make_requests(req, self.app.account_ring,
+            account_partition, 'DELETE', req.path_info,
+            [headers] * len(accounts))
 
 
 class BaseApplication(object):
diff --git a/swift/stats/log_processor.py b/swift/stats/log_processor.py
index f2cfd220ce..5e63fe10a5 100644
--- a/swift/stats/log_processor.py
+++ b/swift/stats/log_processor.py
@@ -440,8 +440,8 @@ class LogProcessorDaemon(Daemon):
         """
         :returns: the keylist mapping.
 
-            The keylist mapping determines how the stats fields are aggregated in
-            the final aggregation step.
+            The keylist mapping determines how the stats fields are aggregated
+            in the final aggregation step.
         """
 
         if self._keylist_mapping == None:
diff --git a/swift/stats/log_uploader.py b/swift/stats/log_uploader.py
index a9248c7c17..4256e64692 100644
--- a/swift/stats/log_uploader.py
+++ b/swift/stats/log_uploader.py
@@ -150,7 +150,8 @@ class LogUploader(Daemon):
 
     def upload_all_logs(self):
         """
-        Match files under log_dir to source_filename_pattern and upload to swift
+        Match files under log_dir to source_filename_pattern and upload to
+        swift
         """
         pattern = self.validate_filename_pattern()
         if not pattern: