Merge pull request #103 from a-detiste/master

remove dependency on old mock
warner · Mar 20, 2024 · ff1edf6 · ff1edf6
2 parents 3b6f93e + d0e7feb
commit ff1edf6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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