diff options
44 files changed, 42 insertions, 69 deletions
@@ -10,15 +10,12 @@ Imports - thou shalt not import objects, only modules - thou shalt not import more than one module per line - thou shalt not make relative imports -- thou shalt "from nova import vendor" before importing third party code - thou shalt organize your imports according to the following template :: # vim: tabstop=4 shiftwidth=4 softtabstop=4 {{stdlib imports in human alphabetical order}} \n - from nova import vendor - {{vendor imports in human alphabetical order}} \n {{nova imports in human alphabetical order}} \n diff --git a/bin/nova-api b/bin/nova-api index 7bc9166b8..ae274abf6 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -23,7 +23,7 @@ Tornado daemon for the main API endpoint. import logging -from nova import vendor + from tornado import httpserver from tornado import ioloop diff --git a/bin/nova-compute b/bin/nova-compute index 803887039..5635efbaf 100755 --- a/bin/nova-compute +++ b/bin/nova-compute @@ -33,7 +33,7 @@ NOVA_PATH = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'nova') if os.path.exists(NOVA_PATH): sys.path.insert(0, os.path.dirname(NOVA_PATH)) -from nova import vendor + from carrot import connection from carrot import messaging from twisted.internet import task diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor index d3f0ae221..d2ed82c9f 100755 --- a/bin/nova-instancemonitor +++ b/bin/nova-instancemonitor @@ -23,7 +23,7 @@ import logging -from nova import vendor + from twisted.internet import task from twisted.application import service diff --git a/bin/nova-objectstore b/bin/nova-objectstore index 7876864c0..8ae80707e 100755 --- a/bin/nova-objectstore +++ b/bin/nova-objectstore @@ -23,7 +23,7 @@ import logging -from nova import vendor + from tornado import httpserver from tornado import ioloop diff --git a/bin/nova-rsapi b/bin/nova-rsapi index c2f2c9d70..cca5b3048 100755 --- a/bin/nova-rsapi +++ b/bin/nova-rsapi @@ -23,7 +23,7 @@ import logging from wsgiref import simple_server -from nova import vendor + from tornado import ioloop from nova import flags diff --git a/bin/nova-volume b/bin/nova-volume index 9b7787c96..8296eb1d8 100755 --- a/bin/nova-volume +++ b/bin/nova-volume @@ -23,7 +23,7 @@ import logging -from nova import vendor + from tornado import ioloop from nova import flags diff --git a/docs/conf.py b/docs/conf.py index 784d8c096..fb3fd1a30 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ import sys, os # documentation root, use os.path.abspath to make it absolute, like shown here. sys.path.append(os.path.abspath('/Users/jmckenty/Projects/cc')) sys.path.append([os.path.abspath('../nova'),os.path.abspath('../'),os.path.abspath('../vendor')]) -from nova import vendor + # -- General configuration ----------------------------------------------------- diff --git a/nova/adminclient.py b/nova/adminclient.py index 1a5f41418..42297faf3 100644 --- a/nova/adminclient.py +++ b/nova/adminclient.py @@ -21,7 +21,7 @@ Nova User API client library. import base64 -from nova import vendor + import boto from boto.ec2.regioninfo import RegionInfo diff --git a/nova/cloudpipe/api.py b/nova/cloudpipe/api.py index 99a0a1d6d..e071167bb 100644 --- a/nova/cloudpipe/api.py +++ b/nova/cloudpipe/api.py @@ -23,7 +23,7 @@ Tornado REST API Request Handlers for CloudPipe import logging import urllib -from nova import vendor + import tornado.web from nova import crypto 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 diff --git a/nova/crypto.py b/nova/crypto.py index 98d412687..f6e9717d0 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -31,7 +31,7 @@ import tempfile import time import utils -from nova import vendor + import M2Crypto from nova import exception diff --git a/nova/datastore.py b/nova/datastore.py index 8d6272ada..ab6da7043 100644 --- a/nova/datastore.py +++ b/nova/datastore.py @@ -25,7 +25,7 @@ before trying to run this. import logging -from nova import vendor + import redis from nova import exception diff --git a/nova/endpoint/api.py b/nova/endpoint/api.py index 255519198..2046d01ae 100755 --- a/nova/endpoint/api.py +++ b/nova/endpoint/api.py @@ -29,7 +29,7 @@ import urllib # TODO(termie): replace minidom with etree from xml.dom import minidom -from nova import vendor + import tornado.web from twisted.internet import defer diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py index 5b713feb9..97f31349c 100644 --- a/nova/endpoint/cloud.py +++ b/nova/endpoint/cloud.py @@ -28,7 +28,7 @@ import logging import os import time -from nova import vendor + from twisted.internet import defer from nova import datastore diff --git a/nova/endpoint/images.py b/nova/endpoint/images.py index 5c6514732..34da907cb 100644 --- a/nova/endpoint/images.py +++ b/nova/endpoint/images.py @@ -25,7 +25,7 @@ import json import random import urllib -from nova import vendor + import boto import boto.s3 diff --git a/nova/endpoint/rackspace.py b/nova/endpoint/rackspace.py index 29a077b24..18cb201a7 100644 --- a/nova/endpoint/rackspace.py +++ b/nova/endpoint/rackspace.py @@ -27,7 +27,7 @@ import multiprocessing import os import time -from nova import vendor + import tornado.web from twisted.internet import defer diff --git a/nova/flags.py b/nova/flags.py index 22e00a44a..60245a349 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -23,7 +23,7 @@ where they're used. import socket -from nova import vendor + from gflags import * # This keeps pylint from barfing on the imports diff --git a/nova/objectstore/handler.py b/nova/objectstore/handler.py index 22cfca5fd..79f01169c 100644 --- a/nova/objectstore/handler.py +++ b/nova/objectstore/handler.py @@ -44,7 +44,7 @@ import logging import multiprocessing -from nova import vendor + from tornado import escape, web from nova import exception diff --git a/nova/process.py b/nova/process.py index 00ec4a267..4c1cef58c 100644 --- a/nova/process.py +++ b/nova/process.py @@ -24,7 +24,7 @@ import logging import multiprocessing import StringIO -from nova import vendor + from twisted.internet import defer from twisted.internet import error from twisted.internet import process diff --git a/nova/rpc.py b/nova/rpc.py index 72a84b7f7..1b171f5d9 100644 --- a/nova/rpc.py +++ b/nova/rpc.py @@ -26,7 +26,7 @@ import logging import sys import uuid -from nova import vendor + from carrot import connection from carrot import messaging from twisted.internet import defer diff --git a/nova/server.py b/nova/server.py index 1a6f33876..8f4ea91a3 100644 --- a/nova/server.py +++ b/nova/server.py @@ -27,7 +27,7 @@ import signal import sys import time -from nova import vendor + import daemon from daemon import pidlockfile diff --git a/nova/test.py b/nova/test.py index 1f8a5ff47..864bc3f5a 100644 --- a/nova/test.py +++ b/nova/test.py @@ -26,7 +26,7 @@ import logging import time import unittest -from nova import vendor + import mox from tornado import ioloop from twisted.internet import defer diff --git a/nova/tests/api_unittest.py b/nova/tests/api_unittest.py index aee57b514..2937ef0b4 100644 --- a/nova/tests/api_unittest.py +++ b/nova/tests/api_unittest.py @@ -20,7 +20,7 @@ import httplib import random import StringIO -from nova import vendor + import boto from boto.ec2 import regioninfo from tornado import httpserver diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py index 9df83ec62..6bafe2ea7 100644 --- a/nova/tests/cloud_unittest.py +++ b/nova/tests/cloud_unittest.py @@ -22,7 +22,7 @@ import time import unittest from xml.etree import ElementTree -from nova import vendor + from tornado import ioloop from twisted.internet import defer diff --git a/nova/tests/future_unittest.py b/nova/tests/future_unittest.py index be4218c39..a4523a315 100644 --- a/nova/tests/future_unittest.py +++ b/nova/tests/future_unittest.py @@ -22,7 +22,7 @@ import time import unittest from xml.etree import ElementTree -from nova import vendor + import mox from tornado import ioloop from twisted.internet import defer diff --git a/nova/tests/model_unittest.py b/nova/tests/model_unittest.py index f70cab40d..37a4c3e80 100644 --- a/nova/tests/model_unittest.py +++ b/nova/tests/model_unittest.py @@ -19,7 +19,7 @@ import logging import time -from nova import vendor + from twisted.internet import defer from nova import exception diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py index dd1966ffa..af9efffbd 100644 --- a/nova/tests/network_unittest.py +++ b/nova/tests/network_unittest.py @@ -20,7 +20,7 @@ import os import logging import unittest -from nova import vendor + import IPy from nova import flags diff --git a/nova/tests/node_unittest.py b/nova/tests/node_unittest.py index 4f7bbd587..60f97741e 100644 --- a/nova/tests/node_unittest.py +++ b/nova/tests/node_unittest.py @@ -21,7 +21,7 @@ import time from xml.etree import ElementTree -from nova import vendor + from twisted.internet import defer from nova import exception diff --git a/nova/tests/objectstore_unittest.py b/nova/tests/objectstore_unittest.py index ca2d31159..0c700ff96 100644 --- a/nova/tests/objectstore_unittest.py +++ b/nova/tests/objectstore_unittest.py @@ -23,7 +23,7 @@ import os import shutil import tempfile -from nova import vendor + from nova import flags from nova import objectstore diff --git a/nova/tests/process_unittest.py b/nova/tests/process_unittest.py index 671ab05cd..fe625b6c8 100644 --- a/nova/tests/process_unittest.py +++ b/nova/tests/process_unittest.py @@ -19,7 +19,7 @@ import logging from xml.etree import ElementTree -from nova import vendor + from twisted.internet import defer from twisted.internet import reactor diff --git a/nova/tests/users_unittest.py b/nova/tests/users_unittest.py index 6110248b5..4bc66ca5c 100644 --- a/nova/tests/users_unittest.py +++ b/nova/tests/users_unittest.py @@ -19,7 +19,7 @@ import logging import unittest -from nova import vendor + from M2Crypto import BIO from M2Crypto import RSA from M2Crypto import X509 diff --git a/nova/tests/validator_unittest.py b/nova/tests/validator_unittest.py index 38cddfef1..fba5b3060 100644 --- a/nova/tests/validator_unittest.py +++ b/nova/tests/validator_unittest.py @@ -19,7 +19,7 @@ import logging import unittest -from nova import vendor + from nova import flags from nova import test diff --git a/nova/twistd.py b/nova/twistd.py index 03de2d0ab..3d7fdeb6e 100644 --- a/nova/twistd.py +++ b/nova/twistd.py @@ -29,7 +29,7 @@ import time import UserDict import logging.handlers -from nova import vendor + from twisted.scripts import twistd from twisted.python import log from twisted.python import reflect diff --git a/nova/vendor.py b/nova/vendor.py deleted file mode 100644 index db75f30ec..000000000 --- a/nova/vendor.py +++ /dev/null @@ -1,24 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -""" -Get our vendor folders into the system path. -""" - -print 'sorry, we cannot include vendor open source libraries... :(' - diff --git a/nova/volume/storage.py b/nova/volume/storage.py index 1507b4ec7..dc67aaeec 100644 --- a/nova/volume/storage.py +++ b/nova/volume/storage.py @@ -30,7 +30,7 @@ import shutil import tempfile import time -from nova import vendor + from tornado import ioloop from twisted.internet import defer diff --git a/run_tests.py b/run_tests.py index bd1587d43..eb26459c5 100644 --- a/run_tests.py +++ b/run_tests.py @@ -41,7 +41,7 @@ Due to our use of multiprocessing it we frequently get some ignorable import __main__ import sys -from nova import vendor + from twisted.scripts import trial as trial_script from nova import datastore diff --git a/smoketests/flags.py b/smoketests/flags.py index ae0001e89..3617fb797 100644 --- a/smoketests/flags.py +++ b/smoketests/flags.py @@ -21,7 +21,7 @@ Package-level global flags are defined here, the rest are defined where they're used. """ -from nova import vendor + from gflags import * # This keeps pylint from barfing on the imports diff --git a/smoketests/novatestcase.py b/smoketests/novatestcase.py index 11c8661ba..513e0ca91 100644 --- a/smoketests/novatestcase.py +++ b/smoketests/novatestcase.py @@ -22,7 +22,7 @@ import random import sys import unittest -from nova import vendor + import paramiko from nova import adminclient diff --git a/smoketests/smoketest.py b/smoketests/smoketest.py index 61967d3b7..ad95114d4 100644 --- a/smoketests/smoketest.py +++ b/smoketests/smoketest.py @@ -25,7 +25,7 @@ import time import unittest import zipfile -from nova import vendor + import paramiko from smoketests import flags |