diff options
| -rw-r--r-- | nova/api/ec2/__init__.py | 2 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 1 | ||||
| -rw-r--r-- | nova/network/quantumv2/__init__.py | 1 | ||||
| -rw-r--r-- | nova/tests/baremetal/test_volume_driver.py | 3 | ||||
| -rw-r--r-- | nova/tests/test_imagecache.py | 1 | ||||
| -rw-r--r-- | nova/tests/test_virt_drivers.py | 1 | ||||
| -rw-r--r-- | nova/virt/baremetal/db/sqlalchemy/models.py | 2 | ||||
| -rw-r--r-- | nova/virt/baremetal/volume_driver.py | 1 |
8 files changed, 2 insertions, 10 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 22771b589..f1ee0154e 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -331,7 +331,7 @@ class Requestify(wsgi.Middleware): for non_arg in non_args: # Remove, but raise KeyError if omitted args.pop(non_arg) - except KeyError, e: + except KeyError: raise webob.exc.HTTPBadRequest() except exception.InvalidRequest as err: raise webob.exc.HTTPBadRequest(explanation=unicode(err)) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 095f76126..8d087f28d 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -32,7 +32,6 @@ from sqlalchemy.orm import joinedload from sqlalchemy.orm import joinedload_all from sqlalchemy.sql.expression import asc from sqlalchemy.sql.expression import desc -from sqlalchemy.sql.expression import literal_column from sqlalchemy.sql import func from nova import block_device diff --git a/nova/network/quantumv2/__init__.py b/nova/network/quantumv2/__init__.py index ff96edf30..914600ed8 100644 --- a/nova/network/quantumv2/__init__.py +++ b/nova/network/quantumv2/__init__.py @@ -15,7 +15,6 @@ # License for the specific language governing permissions and limitations # under the License. -from nova import exception from nova.openstack.common import cfg from nova.openstack.common import excutils from nova.openstack.common import log as logging diff --git a/nova/tests/baremetal/test_volume_driver.py b/nova/tests/baremetal/test_volume_driver.py index e1b81d0b1..db0dd3591 100644 --- a/nova/tests/baremetal/test_volume_driver.py +++ b/nova/tests/baremetal/test_volume_driver.py @@ -17,11 +17,8 @@ Tests for baremetal volume driver. """ -import mox - from nova.openstack.common import cfg from nova import test -from nova import utils from nova.virt.baremetal import volume_driver diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py index bfa948ce5..ebda2c718 100644 --- a/nova/tests/test_imagecache.py +++ b/nova/tests/test_imagecache.py @@ -26,7 +26,6 @@ import time from nova import test -from nova.compute import manager as compute_manager from nova.compute import vm_states from nova import db from nova.openstack.common import cfg diff --git a/nova/tests/test_virt_drivers.py b/nova/tests/test_virt_drivers.py index 8e5e258ea..58ca11a1a 100644 --- a/nova/tests/test_virt_drivers.py +++ b/nova/tests/test_virt_drivers.py @@ -14,7 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. -import __builtin__ import base64 import fixtures import netaddr diff --git a/nova/virt/baremetal/db/sqlalchemy/models.py b/nova/virt/baremetal/db/sqlalchemy/models.py index f18c68960..005f2d945 100644 --- a/nova/virt/baremetal/db/sqlalchemy/models.py +++ b/nova/virt/baremetal/db/sqlalchemy/models.py @@ -20,7 +20,7 @@ SQLAlchemy models for baremetal data. """ from sqlalchemy import Column, Integer, String -from sqlalchemy import ForeignKey, DateTime, Text, Index +from sqlalchemy import ForeignKey, Text from sqlalchemy.ext.declarative import declarative_base from nova.db.sqlalchemy import models diff --git a/nova/virt/baremetal/volume_driver.py b/nova/virt/baremetal/volume_driver.py index 6708b33ab..7f59ec517 100644 --- a/nova/virt/baremetal/volume_driver.py +++ b/nova/virt/baremetal/volume_driver.py @@ -25,7 +25,6 @@ from nova.openstack.common import importutils from nova.openstack.common import log as logging from nova import utils from nova.virt.baremetal import db as bmdb -from nova.virt import driver from nova.virt.libvirt import utils as libvirt_utils opts = [ |