Remove use of 'extras'

We weren't explicitly stating this dependency, instead relying on it
being brought in by testtools. Since we want to remove it from
testtools, we should drop it from here also. There's only one use of the
'try_imports' helper and a simple try-except does almost the same thing.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

1 files changed, 7 insertions, 5 deletions

diff --git a/fixtures/_fixtures/mockpatch.py b/fixtures/_fixtures/mockpatch.py
index 8279a0f..6fa63bd 100644
--- a/fixtures/_fixtures/mockpatch.py
+++ b/fixtures/_fixtures/mockpatch.py
@@ -15,13 +15,15 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import extras
-
 import fixtures
 
-mock = extras.try_imports(['mock', 'unittest.mock'], None)
-mock_default = extras.try_imports(
-    ['mock.DEFAULT', 'unittest.mock.DEFAULT'], None)
+# TODO(stephenfin): Make this configurable
+try:
+    import mock
+except ImportError:
+    import unittest.mock as mock
+
+mock_default = mock.DEFAULT
 
 
 class _Base(fixtures.Fixture):