remove import of vendor since we have PPA now

HACKING

@@ -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

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
 

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

bin/nova-instancemonitor

@@ -23,7 +23,7 @@
 
 import logging
 
-from nova import vendor
+
 from twisted.internet import task
 from twisted.application import service
 

bin/nova-objectstore

@@ -23,7 +23,7 @@
 
 import logging
 
-from nova import vendor 
+ 
 from tornado import httpserver
 from tornado import ioloop
 

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

bin/nova-volume

@@ -23,7 +23,7 @@
 
 import logging
 
-from nova import vendor
+
 from tornado import ioloop
 
 from nova import flags

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 -----------------------------------------------------
 

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
 

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

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

nova/compute/model.py

@@ -43,7 +43,7 @@ True
 import logging
 import time
 
-from nova import vendor
+
 import redis
 
 from nova import datastore

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

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

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

nova/crypto.py

@@ -31,7 +31,7 @@ import tempfile
 import time
 import utils
 
-from nova import vendor
+
 import M2Crypto
 
 from nova import exception

nova/datastore.py

@@ -25,7 +25,7 @@ before trying to run this.
 
 import logging
 
-from nova import vendor
+
 import redis
 
 from nova import exception

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
 

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

nova/endpoint/images.py

@@ -25,7 +25,7 @@ import json
 import random
 import urllib
 
-from nova import vendor
+
 import boto
 import boto.s3
 

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
 

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

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

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

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

nova/server.py

@@ -27,7 +27,7 @@ import signal
 import sys
 import time
 
-from nova import vendor
+
 import daemon
 from daemon import pidlockfile
 

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

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

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
 

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

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

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

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

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

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
 

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

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

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

nova/vendor.py

@@ -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... :('
-

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
 

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

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

smoketests/novatestcase.py

@@ -22,7 +22,7 @@ import random
 import sys
 import unittest
 
-from nova import vendor
+
 import paramiko
 
 from nova import adminclient

smoketests/smoketest.py

@@ -25,7 +25,7 @@ import time
 import unittest
 import zipfile
 
-from nova import vendor
+
 import paramiko
 
 from smoketests import flags