summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEwan Mellor <ewan.mellor@citrix.com>2011-08-28 18:11:36 +0000
committerTarmac <>2011-08-28 18:11:36 +0000
commitde05bf07a69f07871e3c6d3e2d87ed8be178754c (patch)
tree7c7b4c66a904c7fb5ca425cf048647be80b0ffcb
parent2a2672f92eacdde70cde3b105b36927d934bbd49 (diff)
parent75c7c841379341c63598850e4676f2146d63334a (diff)
downloadnova-de05bf07a69f07871e3c6d3e2d87ed8be178754c.tar.gz
nova-de05bf07a69f07871e3c6d3e2d87ed8be178754c.tar.xz
nova-de05bf07a69f07871e3c6d3e2d87ed8be178754c.zip
Bug #835964: pep8 violations in IPv6 code
Fix pep8 violations.
-rw-r--r--nova/ipv6/account_identifier.py3
-rw-r--r--nova/tests/test_ipv6.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/ipv6/account_identifier.py b/nova/ipv6/account_identifier.py
index 27bb01988..8a08510ac 100644
--- a/nova/ipv6/account_identifier.py
+++ b/nova/ipv6/account_identifier.py
@@ -39,7 +39,8 @@ def to_global(prefix, mac, project_id):
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):
diff --git a/nova/tests/test_ipv6.py b/nova/tests/test_ipv6.py
index 04c1b5598..e1ba4aafb 100644
--- a/nova/tests/test_ipv6.py
+++ b/nova/tests/test_ipv6.py
@@ -48,7 +48,7 @@ class IPv6RFC2462TestCase(test.TestCase):
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')