From 4acafc7ff3e1306f3400853ec79762f45ef0ae5c Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Fri, 21 Dec 2012 08:39:32 -0600 Subject: Removed unused imports. Removed a bunch of unused imports based on pyflakes. Change-Id: I00952371200cb4531ddf163447433da756582a21 Signed-off-by: Chuck Short --- nova/virt/baremetal/db/sqlalchemy/api.py | 7 ------- .../virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py | 5 ++--- nova/virt/baremetal/db/sqlalchemy/models.py | 7 ++----- nova/virt/libvirt/utils.py | 1 - nova/virt/powervm/blockdev.py | 1 - nova/virt/powervm/driver.py | 5 ----- nova/virt/xenapi/driver.py | 1 - nova/virt/xenapi/host.py | 1 - nova/virt/xenapi/pool.py | 1 - 9 files changed, 4 insertions(+), 25 deletions(-) (limited to 'nova/virt') diff --git a/nova/virt/baremetal/db/sqlalchemy/api.py b/nova/virt/baremetal/db/sqlalchemy/api.py index 48606ac44..abdb19fb7 100644 --- a/nova/virt/baremetal/db/sqlalchemy/api.py +++ b/nova/virt/baremetal/db/sqlalchemy/api.py @@ -20,15 +20,8 @@ """Implementation of SQLAlchemy backend.""" -from sqlalchemy import and_ -from sqlalchemy.exc import IntegrityError -from sqlalchemy import or_ -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.db.sqlalchemy.api import is_user_context from nova.db.sqlalchemy.api import require_admin_context diff --git a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py index d945755fc..2d899406c 100644 --- a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py +++ b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py @@ -15,9 +15,8 @@ # License for the specific language governing permissions and limitations # under the License. -from migrate import ForeignKeyConstraint -from sqlalchemy import Boolean, BigInteger, Column, DateTime, Float, ForeignKey -from sqlalchemy import Index, Integer, MetaData, String, Table, Text +from sqlalchemy import Boolean, Column, DateTime +from sqlalchemy import Index, Integer, MetaData, String, Table from nova.openstack.common import log as logging diff --git a/nova/virt/baremetal/db/sqlalchemy/models.py b/nova/virt/baremetal/db/sqlalchemy/models.py index c1ab191d0..f18c68960 100644 --- a/nova/virt/baremetal/db/sqlalchemy/models.py +++ b/nova/virt/baremetal/db/sqlalchemy/models.py @@ -19,12 +19,9 @@ SQLAlchemy models for baremetal data. """ -from sqlalchemy.orm import relationship, backref, object_mapper -from sqlalchemy import Column, Integer, BigInteger, String, schema -from sqlalchemy import ForeignKey, DateTime, Boolean, Text, Float, Index -from sqlalchemy.exc import IntegrityError +from sqlalchemy import Column, Integer, String +from sqlalchemy import ForeignKey, DateTime, Text, Index from sqlalchemy.ext.declarative import declarative_base -from sqlalchemy.schema import ForeignKeyConstraint from nova.db.sqlalchemy import models diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py index c01327d3d..0d56275a0 100644 --- a/nova/virt/libvirt/utils.py +++ b/nova/virt/libvirt/utils.py @@ -20,7 +20,6 @@ # under the License. import os -import time from lxml import etree diff --git a/nova/virt/powervm/blockdev.py b/nova/virt/powervm/blockdev.py index c9d26b740..b359716ff 100644 --- a/nova/virt/powervm/blockdev.py +++ b/nova/virt/powervm/blockdev.py @@ -18,7 +18,6 @@ import hashlib import os import re -from nova import exception as nova_exception from nova import utils from nova.openstack.common import cfg diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py index b43cf091c..0821d4d84 100644 --- a/nova/virt/powervm/driver.py +++ b/nova/virt/powervm/driver.py @@ -14,11 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.compute import task_states -from nova.compute import vm_states - -from nova import context as nova_context - from nova.openstack.common import cfg from nova.openstack.common import log as logging diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py index eefa25d41..7bf27b7e0 100644 --- a/nova/virt/xenapi/driver.py +++ b/nova/virt/xenapi/driver.py @@ -39,7 +39,6 @@ A driver for XenServer or Xen Cloud Platform. import contextlib import cPickle as pickle -import time import urlparse import xmlrpclib diff --git a/nova/virt/xenapi/host.py b/nova/virt/xenapi/host.py index e893abf4f..045409e4f 100644 --- a/nova/virt/xenapi/host.py +++ b/nova/virt/xenapi/host.py @@ -25,7 +25,6 @@ from nova.compute import task_states from nova.compute import vm_states from nova import context from nova import exception -from nova import notifications from nova.openstack.common import jsonutils from nova.virt.xenapi import pool_states from nova.virt.xenapi import vm_utils diff --git a/nova/virt/xenapi/pool.py b/nova/virt/xenapi/pool.py index 5e6a8195c..40b1b029f 100644 --- a/nova/virt/xenapi/pool.py +++ b/nova/virt/xenapi/pool.py @@ -26,7 +26,6 @@ from nova import exception from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova.openstack.common import log as logging -from nova.openstack.common import rpc from nova.virt.xenapi import pool_states from nova.virt.xenapi import vm_utils -- cgit