Merge "python3: Transition to mox3 instead of mox"

This commit is contained in:
Jenkins
2013-08-30 02:39:32 +00:00
committed by Gerrit Code Review
4 changed files with 4 additions and 4 deletions

View File

@@ -6,7 +6,7 @@ fixtures>=0.3.12
httpretty>=0.6.3 httpretty>=0.6.3
keyring>=1.6.1 keyring>=1.6.1
mock>=0.8.0 mock>=0.8.0
mox>=0.5.3 mox3>=0.7.0
pycrypto>=2.6 pycrypto>=2.6
sphinx>=1.1.2 sphinx>=1.1.2
testrepository>=0.0.17 testrepository>=0.0.17

View File

@@ -15,7 +15,7 @@
import time import time
import mock import mock
import mox from mox3 import mox
import requests import requests
import testtools import testtools

View File

@@ -14,9 +14,9 @@
import cStringIO import cStringIO
import os import os
import stubout
import sys import sys
from mox3 import stubout
from testtools import matchers from testtools import matchers
from keystoneclient import httpclient from keystoneclient import httpclient

View File

@@ -19,7 +19,7 @@ import urlparse
import uuid import uuid
import mock import mock
import mox from mox3 import mox
import requests import requests
import testtools import testtools