Use the standard library's copy of mock when it's available.
Change-Id: Id6a31157582efe47cc3a74e6658679c2bec14767
This commit is contained in:
parent
21db1bf836
commit
4e7bc75432
@ -13,8 +13,12 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
|
try:
|
||||||
|
from unittest import mock
|
||||||
|
except ImportError:
|
||||||
|
import mock
|
||||||
|
|
||||||
from six import StringIO
|
from six import StringIO
|
||||||
import mock
|
|
||||||
import testtools
|
import testtools
|
||||||
|
|
||||||
from swiftclient import command_helpers as h
|
from swiftclient import command_helpers as h
|
||||||
|
@ -15,7 +15,12 @@
|
|||||||
|
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
import mock
|
|
||||||
|
try:
|
||||||
|
from unittest import mock
|
||||||
|
except ImportError:
|
||||||
|
import mock
|
||||||
|
|
||||||
import testtools
|
import testtools
|
||||||
import threading
|
import threading
|
||||||
import six
|
import six
|
||||||
|
@ -14,8 +14,13 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
# TODO: More tests
|
# TODO: More tests
|
||||||
import mock
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
try:
|
||||||
|
from unittest import mock
|
||||||
|
except ImportError:
|
||||||
|
import mock
|
||||||
|
|
||||||
import six
|
import six
|
||||||
import socket
|
import socket
|
||||||
import testtools
|
import testtools
|
||||||
|
Loading…
x
Reference in New Issue
Block a user