From c8fdce011092f23efd55385b45db8e6f3886beb1 Mon Sep 17 00:00:00 2001 From: Jesse Andrews Date: Thu, 15 Jul 2010 11:07:40 -0500 Subject: remove import of vendor since we have PPA now --- nova/compute/disk.py | 2 +- nova/compute/model.py | 2 +- nova/compute/monitor.py | 2 +- nova/compute/network.py | 2 +- nova/compute/node.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/disk.py b/nova/compute/disk.py index b24a90d7f..b476987bb 100644 --- a/nova/compute/disk.py +++ b/nova/compute/disk.py @@ -25,7 +25,7 @@ import logging import os import tempfile -from nova import vendor + from twisted.internet import defer from nova import exception diff --git a/nova/compute/model.py b/nova/compute/model.py index f1eb99e74..2d8a036a5 100644 --- a/nova/compute/model.py +++ b/nova/compute/model.py @@ -43,7 +43,7 @@ True import logging import time -from nova import vendor + import redis from nova import datastore diff --git a/nova/compute/monitor.py b/nova/compute/monitor.py index b9fe20a71..64852838d 100644 --- a/nova/compute/monitor.py +++ b/nova/compute/monitor.py @@ -36,7 +36,7 @@ except Exception, err: logging.warning('no libvirt found') from nova import flags -from nova import vendor + import boto import boto.s3 import libxml2 diff --git a/nova/compute/network.py b/nova/compute/network.py index 8592d7af7..faac74e54 100644 --- a/nova/compute/network.py +++ b/nova/compute/network.py @@ -25,7 +25,7 @@ import os import time # TODO(termie): clean up these imports -from nova import vendor + import IPy from nova import datastore diff --git a/nova/compute/node.py b/nova/compute/node.py index 7e4277f58..488e8870f 100644 --- a/nova/compute/node.py +++ b/nova/compute/node.py @@ -31,7 +31,7 @@ import os import shutil import sys -from nova import vendor + from twisted.internet import defer from twisted.internet import task from twisted.application import service -- cgit