Import unittest.mock preferentially over mock

# 279
mwouts · Jul 9, 2019 · 15605d9 · 15605d9
1 parent 7206e2f
commit 15605d9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/jupytext/contentsmanager.py b/jupytext/contentsmanager.py
@@ -3,10 +3,11 @@
 import os
 from datetime import timedelta
 import nbformat
+
 try:
-    import mock
-except ImportError:
     import unittest.mock as mock
+except ImportError:
+    import mock
 from tornado.web import HTTPError
 from traitlets import Unicode, Float, Bool, Enum
 from traitlets.config import Configurable

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,8 +1,9 @@
 import pytest
+
 try:
-    import mock
-except ImportError:
     import unittest.mock as mock
+except ImportError:
+    import mock
 
 
 @pytest.fixture

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -2,10 +2,11 @@
 import sys
 import time
 import stat
+
 try:
-    import mock
-except ImportError:
     import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 import nbformat
 import itertools

diff --git a/tests/test_read_simple_markdown.py b/tests/test_read_simple_markdown.py
@@ -1,7 +1,7 @@
 try:
-    import mock
-except ImportError:
     import unittest.mock as mock
+except ImportError:
+    import mock
 from nbformat.v4.nbbase import new_code_cell, new_raw_cell, new_markdown_cell
 from jupytext.compare import compare
 import jupytext