Merge lp:~jk0/glance/pep8 into lp:~hudson-openstack/glance/trunk

[Josh Kearney]

PEP8 cleanup.

[Rick Harris (rconradharris)]

lgtm

review: Approve

[Jay Pipes (jaypipes)]

Cool.

review: Approve

=== modified file 'doc/source/conf.py'
--- doc/source/conf.py	2011-01-26 16:01:48 +0000
+++ doc/source/conf.py	2011-01-26 16:54:54 +0000
@@ -118,9 +118,9 @@
 # A list of ignored prefixes for module index sorting.
 modindex_common_prefix = ['glance.']
 
-# -- Options for man page output -----------------------------------------------
+# -- Options for man page output ----------------------------------------------
 
-# Grouping the document tree for man pages. 
+# Grouping the document tree for man pages.
 # List of tuples 'sourcefile', 'target', u'title', u'Authors name', 'manual'
 
 man_pages = [
 
=== modified file 'tests/stubs.py'
--- tests/stubs.py	2011-01-20 20:27:41 +0000
+++ tests/stubs.py	2011-01-26 16:54:54 +0000
@@ -117,6 +117,7 @@
 
     class FakeSwiftAuth(object):
         pass
+
     class FakeS3Connection(object):
         pass
 
@@ -134,8 +135,8 @@
 
             def chunk_it():
                 for i in xrange(0, len(cls.DATA), cls.CHUNK_SIZE):
-                    yield cls.DATA[i:i+cls.CHUNK_SIZE]
-            
+                    yield cls.DATA[i:i + cls.CHUNK_SIZE]
+
             return chunk_it()
 
     fake_swift_backend = FakeS3Backend()
 
=== modified file 'tests/unit/test_clients.py'
--- tests/unit/test_clients.py	2011-01-18 17:58:23 +0000
+++ tests/unit/test_clients.py	2011-01-26 16:54:54 +0000
@@ -388,7 +388,7 @@
                    'is_public': True,
                    'type': 'kernel'
                   }
-       
+
         image_meta = self.client.add_image(fixture)
         self.assertEquals('queued', image_meta['status'])
         self.assertEquals(0, image_meta['size'])
@@ -401,7 +401,7 @@
                    'size': 19,
                    'location': "file:///tmp/glance-tests/2",
                   }
-        
+
         new_image = self.client.add_image(fixture)
         new_image_id = new_image['id']
 
@@ -434,7 +434,7 @@
                     'location': "file:///tmp/glance-tests/2",
                     'properties': {'distro': 'Ubuntu 10.04 LTS'}
                   }
-        
+
         new_image = self.client.add_image(fixture)
         new_image_id = new_image['id']
 
 
=== modified file 'tests/unit/test_stores.py'
--- tests/unit/test_stores.py	2011-01-14 19:32:52 +0000
+++ tests/unit/test_stores.py	2011-01-26 16:54:54 +0000
@@ -96,17 +96,16 @@
     def test_get(self):
         s3_uri = "s3://user:password@localhost/bucket1/file.tar.gz"
 
-        expected_returns = ['I ', 'am', ' a', ' t', 'ea', 'po', 't,', ' s', 
+        expected_returns = ['I ', 'am', ' a', ' t', 'ea', 'po', 't,', ' s',
                             'ho', 'rt', ' a', 'nd', ' s', 'to', 'ut', '\n']
-        fetcher = get_from_backend(s3_uri, 
-                                   expected_size=8, 
+        fetcher = get_from_backend(s3_uri,
+                                   expected_size=8,
                                    conn_class=S3Backend)
 
         chunks = [c for c in fetcher]
         self.assertEqual(chunks, expected_returns)
 
 
-
 class TestSwiftBackend(TestBackend):
 
     def setUp(self):