Merge lp:~ewanmellor/nova/lp835964 into lp:~hudson-openstack/nova/trunk

[Ewan Mellor]

Bug #835964: pep8 violations in IPv6 code

Fix pep8 violations.

Bug #835964: pep8 violations in IPv6 code

Fix pep8 violations.

[Brian Lamar (blamar)]

review: Approve

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

=== modified file 'nova/ipv6/account_identifier.py'
--- nova/ipv6/account_identifier.py	2011-08-22 01:01:34 +0000
+++ nova/ipv6/account_identifier.py	2011-08-28 10:51:40 +0000
@@ -39,7 +39,8 @@
     except TypeError:
         raise TypeError(_('Bad prefix for to_global_ipv6: %s') % prefix)
     except NameError:
-        raise TypeError(_('Bad project_id for to_global_ipv6: %s') % project_id)
+        raise TypeError(_('Bad project_id for to_global_ipv6: %s') %
+                        project_id)
 
 
 def to_mac(ipv6_address):

=== modified file 'nova/tests/test_ipv6.py'
--- nova/tests/test_ipv6.py	2011-08-24 16:01:48 +0000
+++ nova/tests/test_ipv6.py	2011-08-28 10:51:40 +0000
@@ -48,7 +48,7 @@
     def test_to_global_with_bad_prefix(self):
         bad_prefix = '82'
         self.assertRaises(TypeError, ipv6.to_global,
-                                    bad_prefix, 
+                                    bad_prefix,
                                     '2001:db8::216:3eff:fe33:4455',
                                     'test')