cleanup tests and fix pep8 issues

2 files changed, 22 insertions, 21 deletions

diff --git a/nova/api/openstack/versions.py b/nova/api/openstack/versions.py
index 49633df88..8e172ae02 100644
--- a/nova/api/openstack/versions.py
+++ b/nova/api/openstack/versions.py
@@ -43,8 +43,8 @@ class Versions(wsgi.Resource):
         }
         serializer = wsgi.ResponseSerializer(body_serializers)
 
-        supported_content_types = ('application/json', 
-                                   'application/xml', 
+        supported_content_types = ('application/json',
+                                   'application/xml',
                                    'application/atom+xml')
         deserializer = wsgi.RequestDeserializer(
             supported_content_types=supported_content_types)
@@ -73,6 +73,7 @@ class Versions(wsgi.Resource):
         versions = [builder.build(version) for version in version_objs]
         return dict(versions=versions)
 
+
 class VersionsXMLSerializer(wsgi.XMLDictSerializer):
     def _versions_to_xml(self, versions):
         root = self._xml_doc.createElement('versions')
@@ -96,13 +97,13 @@ class VersionsXMLSerializer(wsgi.XMLDictSerializer):
 
         return version_node
 
-
     def default(self, data):
         self._xml_doc = minidom.Document()
         node = self._versions_to_xml(data['versions'])
 
         return self.to_xml_string(node)
 
+
 class VersionsAtomSerializer(wsgi.XMLDictSerializer):
     def __init__(self, metadata=None, xmlns=None):
         if not xmlns:
@@ -121,7 +122,8 @@ class VersionsAtomSerializer(wsgi.XMLDictSerializer):
     def _get_most_recent_update(self, versions):
         recent = None
         for version in versions:
-            updated = datetime.strptime(version['updated'],'%Y-%m-%dT%H:%M:%SZ')
+            updated = datetime.strptime(version['updated'],
+                                        '%Y-%m-%dT%H:%M:%SZ')
             if not recent:
                 recent = updated
             elif updated > recent:
@@ -132,7 +134,7 @@ class VersionsAtomSerializer(wsgi.XMLDictSerializer):
     def _get_base_url(self, link_href):
         # Make sure no trailing /
         link_href = link_href.rstrip('/')
-        return link_href.rsplit('/',1)[0] + '/'
+        return link_href.rsplit('/', 1)[0] + '/'
 
     def _create_meta(self, root, versions):
         title = self._create_text_elem('title', 'Available API Versions',
@@ -164,7 +166,7 @@ class VersionsAtomSerializer(wsgi.XMLDictSerializer):
             entry = self._xml_doc.createElement('entry')
 
             id = self._create_text_elem('id', version['links'][0]['href'])
-            title = self._create_text_elem('title', 
+            title = self._create_text_elem('title',
                                            'Version %s' % version['id'],
                                            type='text')
             updated = self._create_text_elem('updated', version['updated'])
@@ -179,9 +181,9 @@ class VersionsAtomSerializer(wsgi.XMLDictSerializer):
                 link_node.setAttribute('href', link['href'])
             entry.appendChild(link_node)
 
-            content = self._create_text_elem('content', 
-                'Version %s %s (%s)' % 
-                    (version['id'], 
+            content = self._create_text_elem('content',
+                'Version %s %s (%s)' %
+                    (version['id'],
                      version['status'],
                      version['updated']),
                 type='text')
diff --git a/nova/tests/api/openstack/test_versions.py b/nova/tests/api/openstack/test_versions.py
index 471afec94..6139731b9 100644
--- a/nova/tests/api/openstack/test_versions.py
+++ b/nova/tests/api/openstack/test_versions.py
@@ -47,7 +47,7 @@ class VersionsTest(test.TestCase):
                 "links": [
                     {
                         "rel": "self",
-                        "href": "http://localhost/v1.1",
+                        "href": "http://localhost/v1.1/",
                     }],
             },
             {
@@ -57,7 +57,7 @@ class VersionsTest(test.TestCase):
                 "links": [
                     {
                         "rel": "self",
-                        "href": "http://localhost/v1.0",
+                        "href": "http://localhost/v1.0/",
                     }],
             },
         ]
@@ -72,11 +72,11 @@ class VersionsTest(test.TestCase):
 
         expected = """<versions>
             <version id="v1.1" status="CURRENT" updated="2011-07-18T11:30:00Z">
-                <atom:link href="http://localhost/v1.1" rel="self"/>
+                <atom:link href="http://localhost/v1.1/" rel="self"/>
             </version>
-            <version id="v1.0" status="DEPRECATED" 
-                updated="2010-10-09T11:30:00Z">
-                <atom:link href="http://localhost/v1.0" rel="self"/>
+            <version id="v1.0" status="DEPRECATED"
+                 updated="2010-10-09T11:30:00Z">
+                <atom:link href="http://localhost/v1.0/" rel="self"/>
             </version>
         </versions>""".replace("  ", "").replace("\n", "")
 
@@ -120,9 +120,9 @@ class VersionsTest(test.TestCase):
                 </content>
             </entry>
         </feed>
-        """.replace("  ", "").replace("\n", "").replace("\t", "")
+        """.replace("  ", "").replace("\n", "")
 
-        actual = res.body.replace("  ", "").replace("\n", "").replace("\t","")
+        actual = res.body.replace("  ", "").replace("\n", "")
 
         self.assertEqual(expected, actual)
 
@@ -132,8 +132,7 @@ class VersionsTest(test.TestCase):
         version_data = {
             "id": "3.2.1",
             "status": "CURRENT",
-            "updated": "2011-07-18T11:30:00Z"
-        }
+            "updated": "2011-07-18T11:30:00Z"}
 
         expected = {
             "id": "3.2.1",
@@ -142,7 +141,7 @@ class VersionsTest(test.TestCase):
             "links": [
                 {
                     "rel": "self",
-                    "href": "http://example.org/3.2.1",
+                    "href": "http://example.org/3.2.1/",
                 },
             ],
         }
@@ -156,7 +155,7 @@ class VersionsTest(test.TestCase):
         base_url = "http://example.org/app/"
         version_number = "v1.4.6"
 
-        expected = "http://example.org/app/v1.4.6"
+        expected = "http://example.org/app/v1.4.6/"
 
         builder = views.versions.ViewBuilder(base_url)
         actual = builder.generate_href(version_number)