summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrey Morris <trey.morris@rackspace.com>2011-04-21 11:54:20 -0500
committerTrey Morris <trey.morris@rackspace.com>2011-04-21 11:54:20 -0500
commitf29be40bffd0b4e2b26ce06d81090d5918e84539 (patch)
treef110e8f225b28f618e0b4ab7deb14f9093dc2d2e
parentb93abf52587da04f8079be9be1ed0f9a473a9613 (diff)
altered imports
-rw-r--r--nova/compute/manager.py1
-rw-r--r--nova/network/api.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index a95ca3f6e..82cf8ea70 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -43,7 +43,6 @@ import socket
import sys
import tempfile
import functools
-import pickle
from eventlet import greenthread
diff --git a/nova/network/api.py b/nova/network/api.py
index ac6941270..ab11a52ce 100644
--- a/nova/network/api.py
+++ b/nova/network/api.py
@@ -20,6 +20,8 @@
Handles all requests relating to instances (guest vms).
"""
+import pickle
+
from nova import db
from nova import exception
from nova import flags