diff --git a/setup.py b/setup.py index 819eec5..2d59502 100755 --- a/setup.py +++ b/setup.py @@ -69,7 +69,7 @@ def run(self): "cmdclass": commands, "install_requires": ["six", "twisted[tls] >= 16.0.0", "pyOpenSSL"], "extras_require": { - "dev": ["mock", "txtorcon >= 19.0.0", + "dev": ["txtorcon >= 19.0.0", "txi2p-tahoe >= 0.3.5; python_version > '3.0'", "txi2p >= 0.3.2; python_version < '3.0'", "pywin32 ; sys_platform == 'win32'"], diff --git a/src/foolscap/test/test_connection.py b/src/foolscap/test/test_connection.py index d379ead..6ebe8ef 100644 --- a/src/foolscap/test/test_connection.py +++ b/src/foolscap/test/test_connection.py @@ -1,5 +1,5 @@ import os -import mock +from unittest import mock from zope.interface import implementer from twisted.trial import unittest from twisted.internet import endpoints, defer, reactor diff --git a/src/foolscap/test/test_logging.py b/src/foolscap/test/test_logging.py index 3cb36ce..127b6a0 100644 --- a/src/foolscap/test/test_logging.py +++ b/src/foolscap/test/test_logging.py @@ -1,7 +1,7 @@ import os, sys, json, time, bz2, base64, re import six -import mock +from unittest import mock from io import StringIO from zope.interface import implementer from twisted.trial import unittest