Merge lp:~jason-koelker/nova/lp762047 into lp:~hudson-openstack/nova/trunk

[Jason Kölker]

pep8 fixes

[Josh Kearney (jk0)]

lgtm

review: Approve

[Jason Kölker (jason-koelker)]

I had to rewite the history on this branch to remove the unicode characters from my name.

[lp:~jason-koelker/nova/lp762047]

993. By Jason Kölker on 2011-04-18

pep8 fixes

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

=== modified file 'nova/api/openstack/contrib/volumes.py'
--- nova/api/openstack/contrib/volumes.py	2011-03-30 00:22:20 +0000
+++ nova/api/openstack/contrib/volumes.py	2011-04-18 20:51:44 +0000
@@ -322,8 +322,7 @@
         # Does this matter?
         res = extensions.ResourceExtension('volumes',
                                         VolumeController(),
-                                        collection_actions={'detail': 'GET'}
-                                          )
+                                        collection_actions={'detail': 'GET'})
         resources.append(res)
 
         res = extensions.ResourceExtension('volume_attachments',

=== modified file 'nova/image/fake.py'
--- nova/image/fake.py	2011-03-30 19:34:10 +0000
+++ nova/image/fake.py	2011-04-18 20:51:44 +0000
@@ -47,8 +47,7 @@
                  'container_format': 'ami',
                  'disk_format': 'raw',
                  'properties': {'kernel_id': FLAGS.null_kernel,
-                                'ramdisk_id': FLAGS.null_kernel}
-                }
+                                'ramdisk_id': FLAGS.null_kernel}}
         self.create(None, image)
         super(FakeImageService, self).__init__()
 

=== modified file 'nova/tests/api/openstack/test_image_metadata.py'
--- nova/tests/api/openstack/test_image_metadata.py	2011-04-08 07:58:48 +0000
+++ nova/tests/api/openstack/test_image_metadata.py	2011-04-18 20:51:44 +0000
@@ -46,8 +46,7 @@
         'deleted_at': None,
         'properties': {
             'key1': 'value1',
-            'key2': 'value2'
-        },
+            'key2': 'value2'},
         'size': 5882349},
         {'status': 'active',
         'name': 'image2',
@@ -62,8 +61,7 @@
         'deleted_at': None,
         'properties': {
             'key1': 'value1',
-            'key2': 'value2'
-        },
+            'key2': 'value2'},
         'size': 5882349},
         {'status': 'active',
         'name': 'image3',

=== modified file 'nova/tests/api/openstack/test_server_metadata.py'
--- nova/tests/api/openstack/test_server_metadata.py	2011-03-24 17:52:20 +0000
+++ nova/tests/api/openstack/test_server_metadata.py	2011-04-18 20:51:44 +0000
@@ -48,8 +48,7 @@
             "key2": "value2",
             "key3": "value3",
             "key4": "value4",
-            "key5": "value5"
-        }
+            "key5": "value5"}
     return metadata
 
 

=== modified file 'nova/tests/api/openstack/test_versions.py'
--- nova/tests/api/openstack/test_versions.py	2011-03-29 16:04:43 +0000
+++ nova/tests/api/openstack/test_versions.py	2011-04-18 20:51:44 +0000
@@ -47,8 +47,7 @@
                     {
                         "rel": "self",
                         "href": "http://localhost/v1.1",
-                    }
-                ],
+                    }],
             },
             {
                 "id": "v1.0",
@@ -57,8 +56,7 @@
                     {
                         "rel": "self",
                         "href": "http://localhost/v1.0",
-                    }
-                ],
+                    }],
             },
         ]
         self.assertEqual(versions, expected)

=== modified file 'nova/virt/vmwareapi/vim.py'
--- nova/virt/vmwareapi/vim.py	2011-03-31 21:19:59 +0000
+++ nova/virt/vmwareapi/vim.py	2011-04-18 20:51:44 +0000
@@ -43,6 +43,7 @@
 
 
 if suds:
+
     class VIMMessagePlugin(suds.plugin.MessagePlugin):
 
         def addAttributeForValue(self, node):