Use oslo-config-2013.1b3

The cfg API is now available via the oslo-config library, so switch to
it and remove the copied-and-pasted version.

Add the 2013.1b3 tarball to tools/pip-requires - this will be changed
to 'oslo-config>=2013.1' when oslo-config is published to pypi. This
will happen in time for grizzly final.

Remove the 'deps = pep8==1.3.3' and 'deps = pyflakes' from tox.ini as
it means all the other deps get installed with easy_install which can't
install oslo-config from the URL.

Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc

7 files changed, 10 insertions, 7 deletions

diff --git a/tests/unit/rpc/common.py b/tests/unit/rpc/common.py
index 2d1e2b6..5a655c6 100644
--- a/tests/unit/rpc/common.py
+++ b/tests/unit/rpc/common.py
@@ -24,8 +24,8 @@ import time
 
 import eventlet
 from eventlet import greenthread
+from oslo.config import cfg
 
-from openstack.common import cfg
 from openstack.common import exception
 from openstack.common.gettextutils import _
 from openstack.common import jsonutils
diff --git a/tests/unit/rpc/test_common.py b/tests/unit/rpc/test_common.py
index fd59929..976da84 100644
--- a/tests/unit/rpc/test_common.py
+++ b/tests/unit/rpc/test_common.py
@@ -20,7 +20,8 @@ Unit Tests for 'common' functons used through rpc code.
 import logging
 import sys
 
-from openstack.common import cfg
+from oslo.config import cfg
+
 from openstack.common import exception
 from openstack.common import importutils
 from openstack.common import jsonutils
diff --git a/tests/unit/rpc/test_fake.py b/tests/unit/rpc/test_fake.py
index 17e4a68..a38250b 100644
--- a/tests/unit/rpc/test_fake.py
+++ b/tests/unit/rpc/test_fake.py
@@ -22,7 +22,8 @@ Unit Tests for remote procedure calls using fake_impl
 import eventlet
 eventlet.monkey_patch()
 
-from openstack.common import cfg
+from oslo.config import cfg
+
 from openstack.common import rpc
 from openstack.common.rpc import impl_fake
 from tests.unit.rpc import common
diff --git a/tests/unit/rpc/test_kombu.py b/tests/unit/rpc/test_kombu.py
index 1bd23d5..cadb630 100644
--- a/tests/unit/rpc/test_kombu.py
+++ b/tests/unit/rpc/test_kombu.py
@@ -27,8 +27,8 @@ import logging
 import time
 
 import mock
+from oslo.config import cfg
 
-from openstack.common import cfg
 from openstack.common import exception
 from openstack.common.rpc import amqp as rpc_amqp
 from openstack.common.rpc import common as rpc_common
diff --git a/tests/unit/rpc/test_kombu_ssl.py b/tests/unit/rpc/test_kombu_ssl.py
index 5507f91..688c992 100644
--- a/tests/unit/rpc/test_kombu_ssl.py
+++ b/tests/unit/rpc/test_kombu_ssl.py
@@ -22,7 +22,8 @@ Unit Tests for remote procedure calls using kombu + ssl
 import eventlet
 eventlet.monkey_patch()
 
-from openstack.common import cfg
+from oslo.config import cfg
+
 from tests import utils as test_utils
 
 
diff --git a/tests/unit/rpc/test_qpid.py b/tests/unit/rpc/test_qpid.py
index 016c5b9..ea68b47 100644
--- a/tests/unit/rpc/test_qpid.py
+++ b/tests/unit/rpc/test_qpid.py
@@ -29,8 +29,8 @@ import fixtures
 import time
 import testtools
 import mox
+from oslo.config import cfg
 
-from openstack.common import cfg
 from openstack.common import context
 from openstack.common.rpc import amqp as rpc_amqp
 from tests import utils
diff --git a/tests/unit/rpc/test_zmq.py b/tests/unit/rpc/test_zmq.py
index 1de78e7..8c9a966 100644
--- a/tests/unit/rpc/test_zmq.py
+++ b/tests/unit/rpc/test_zmq.py
@@ -26,8 +26,8 @@ import os
 import socket
 
 import fixtures
+from oslo.config import cfg
 
-from openstack.common import cfg
 from openstack.common import exception
 from openstack.common.gettextutils import _
 from openstack.common import processutils