remove usage of old mock (#967)

* remove usage of old mock
* trim extraneous blank line

docs/conf.py

@@ -40,11 +40,7 @@
 # serve to show the default.
 
 import sys, os
-
-try:
-    from unittest.mock import MagicMock
-except ImportError:
-    from mock import Mock as MagicMock
+from unittest.mock import MagicMock
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

docs/requirements-mocked.txt

@@ -1,5 +1,4 @@
 # This file holds some fake requirements to fool the readthedocs service into
 # building the documentation. For more information, see
 # https://github.com/geopython/pycsw/issues/521
-mock
 sphinx

requirements-dev.txt

@@ -2,7 +2,6 @@
 -r requirements-standalone.txt
 
 apipkg==1.4
-mock==2.0.0
 Paver==1.2.4
 pytest==6.2.4
 pytest-cov==2.12.0

tests/unittests/test_util.py

@@ -32,8 +32,8 @@
 import os
 import time
 from pathlib import Path
+from unittest import mock
 
-import mock
 import pytest
 from shapely.wkt import loads
 

tests/unittests/test_wsgi.py

@@ -30,9 +30,9 @@
 # =================================================================
 """Unit tests for pycsw.wsgi"""
 
+from unittest import mock
 from wsgiref.util import setup_testing_defaults
 
-import mock
 import pytest
 
 from pycsw import wsgi