From 8f42f105b6dfadf4cb954436365283e6d200c948 Mon Sep 17 00:00:00 2001
From: Chuck Short <chuck.short@canonical.com>
Date: Fri, 23 Aug 2013 12:13:25 -0400
Subject: [PATCH] python3: Transition to mox3 instead of mox

In order to make the transition to mox free world,
mox needs to replaced with mox3 which is python3 compatible.

Change-Id: Id18928c7ac93b510a4867acb03896899fe1c13b0
Signed-off-by: Chuck Short <chuck.short@canonical.com>
---
 test-requirements.txt    | 2 +-
 tests/utils.py           | 2 +-
 tests/v2_0/test_shell.py | 2 +-
 tests/v3/utils.py        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 2525fa8a1..e179cdae4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,7 @@ fixtures>=0.3.12
 httpretty>=0.6.3
 keyring>=1.6.1
 mock>=0.8.0
-mox>=0.5.3
+mox3>=0.7.0
 pycrypto>=2.6
 sphinx>=1.1.2
 testrepository>=0.0.17
diff --git a/tests/utils.py b/tests/utils.py
index b3c4dc475..00ee72968 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -1,7 +1,7 @@
 import time
 
 import mock
-import mox
+from mox3 import mox
 import requests
 import testtools
 
diff --git a/tests/v2_0/test_shell.py b/tests/v2_0/test_shell.py
index 0fc8d6cec..b82bcca94 100644
--- a/tests/v2_0/test_shell.py
+++ b/tests/v2_0/test_shell.py
@@ -1,8 +1,8 @@
 import cStringIO
 import os
-import stubout
 import sys
 
+from mox3 import stubout
 from testtools import matchers
 
 from keystoneclient import httpclient
diff --git a/tests/v3/utils.py b/tests/v3/utils.py
index 3b663f551..0e025a62b 100644
--- a/tests/v3/utils.py
+++ b/tests/v3/utils.py
@@ -5,7 +5,7 @@ import urlparse
 import uuid
 
 import mock
-import mox
+from mox3 import mox
 import requests
 import testtools