remove python2 cruft & ancient mock

development.txt

@@ -8,7 +8,6 @@ httplib2>=0.17.0
 httpx>=0.18.1
 ipdb>=0.13.2
 mccabe>=0.6.1
-mock>=3.0.5;python_version<"3.3"
 ndg-httpsclient>=0.5.1
 nose-randomly>=1.2.6
 nose>=1.3.7

httpretty/errors.py

@@ -24,7 +24,6 @@
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
-from __future__ import unicode_literals
 import json
 
 class HTTPrettyError(Exception):

httpretty/http.py

@@ -23,8 +23,6 @@
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
-from __future__ import unicode_literals
-
 import re
 from .compat import BaseClass
 from .utils import decode_utf8

tests/__init__.py

@@ -1,4 +1,3 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 import sure

tests/functional/base.py

@@ -25,8 +25,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
-from __future__ import unicode_literals
-
 import os
 import json
 import socket

tests/functional/test_bypass.py

@@ -24,7 +24,6 @@
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
-from __future__ import unicode_literals
 import time
 import requests
 try:

tests/functional/test_fakesocket.py

@@ -27,8 +27,7 @@
 
 import functools
 import socket
-
-import mock
+from unittest import mock
 
 
 class FakeSocket(socket.socket):

tests/functional/test_httplib2.py

@@ -24,9 +24,8 @@
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
-from __future__ import unicode_literals
-
 import re
+
 import httplib2
 from freezegun import freeze_time
 from sure import expect, within, miliseconds

tests/functional/test_requests.py

@@ -28,6 +28,7 @@
 import requests
 import signal
 import httpretty
+from unittest.mock import Mock
 
 from freezegun import freeze_time
 from contextlib import contextmanager
@@ -38,8 +39,6 @@
 
 from tests.functional.base import FIXTURE_FILE, use_tornado_server
 
-from tests.compat import Mock
-
 
 try:
     advance_iterator = next

tests/functional/test_urllib2.py

@@ -24,8 +24,6 @@
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
-from __future__ import unicode_literals
-
 import re
 try:
     from urllib.request import urlopen

tests/functional/testserver.py

@@ -24,8 +24,6 @@
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
-from __future__ import unicode_literals
-
 import os
 import time
 import socket

tests/pyopenssl/test_mock.py

@@ -24,8 +24,6 @@
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
-from __future__ import unicode_literals
-
 import requests
 
 from httpretty import HTTPretty, httprettified

tests/unit/test_core.py

@@ -1,14 +1,14 @@
 import io
 import json
 import errno
+from unittest.mock import Mock, patch, call
 
 from freezegun import freeze_time
 from sure import expect
 
 from httpretty.core import HTTPrettyRequest, FakeSSLSocket, fakesock, httpretty
 from httpretty.core import URIMatcher, URIInfo
 
-from tests.compat import Mock, patch, call
 
 
 class SocketErrorStub(Exception):

tests/unit/test_http.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 from httpretty.http import parse_requestline
 
 

tests/unit/test_httpretty.py

@@ -24,19 +24,19 @@
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
-from __future__ import unicode_literals
 import re
 import json
+from unittest.mock import MagicMock, patch
+
 from sure import expect
+
 import httpretty
 from httpretty import HTTPretty
 from httpretty import HTTPrettyError
 from httpretty import core
 from httpretty.core import URIInfo, BaseClass, Entry, FakeSockFile, HTTPrettyRequest
 from httpretty.http import STATUSES
 
-from tests.compat import MagicMock, patch
-
 
 TEST_HEADER = """
 GET /test/test.html HTTP/1.1

tests/unit/test_main.py

@@ -1,14 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from unittest.mock import patch
+
 import httpretty
 from httpretty.core import HTTPrettyRequest
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
-
 
 @patch('httpretty.httpretty')
 def test_last_request(original):