diff options
| author | Monty Taylor <mordred@inaugust.com> | 2012-07-02 08:48:28 -0400 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2012-07-02 08:50:41 -0400 |
| commit | 8d8d3b4296bf37f10c9b0faa0e86ebfdc8b05862 (patch) | |
| tree | c1565380c10d99506ad29d8d1fc62e1ec388aa91 /contrib | |
| parent | 019d953ef5b4bed7c53401375bfd7aa890fc0c1d (diff) | |
| download | nova-8d8d3b4296bf37f10c9b0faa0e86ebfdc8b05862.tar.gz nova-8d8d3b4296bf37f10c9b0faa0e86ebfdc8b05862.tar.xz nova-8d8d3b4296bf37f10c9b0faa0e86ebfdc8b05862.zip | |
Run hacking tests as part of the gate.
Nova has additional pep8 "plugins" that they expect to run as part of the
gate. This patch will run tools/hacking.py instead of pep8 directly. Also,
it fixes the hacking violaions in contrib, plugins and smoketests.
Fixes bug 1010136
Change-Id: I86d8789218c197d5d4a43d1201465d340646a395
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/boto_v6/ec2/connection.py | 4 | ||||
| -rw-r--r-- | contrib/boto_v6/ec2/instance.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/boto_v6/ec2/connection.py b/contrib/boto_v6/ec2/connection.py index a0cfd7e26..940608ffd 100644 --- a/contrib/boto_v6/ec2/connection.py +++ b/contrib/boto_v6/ec2/connection.py @@ -3,11 +3,11 @@ Created on 2010/12/20 @author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp> ''' -import boto import base64 +import boto import boto.ec2 -from boto_v6.ec2.instance import ReservationV6 from boto.ec2.securitygroup import SecurityGroup +from boto_v6.ec2.instance import ReservationV6 class EC2ConnectionV6(boto.ec2.EC2Connection): diff --git a/contrib/boto_v6/ec2/instance.py b/contrib/boto_v6/ec2/instance.py index 9208c05ad..74adccc00 100644 --- a/contrib/boto_v6/ec2/instance.py +++ b/contrib/boto_v6/ec2/instance.py @@ -3,10 +3,10 @@ Created on 2010/12/20 @author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp> ''' -from boto.resultset import ResultSet -from boto.ec2.instance import Reservation from boto.ec2.instance import Group from boto.ec2.instance import Instance +from boto.ec2.instance import Reservation +from boto.resultset import ResultSet class ReservationV6(Reservation): |