remove use of mock package

use unittest.mock throughout

ligo/gracedb/cli/commands/tests/test_add.py

@@ -2,10 +2,7 @@
 #  Ex: 'gracedb add event'
 import pytest
 import shlex
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 # Apply module-level mark
 pytestmark = pytest.mark.cli

ligo/gracedb/cli/commands/tests/test_create.py

@@ -4,10 +4,7 @@ import datetime
 import pytest
 import shlex
 import six
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 # Apply module-level mark
 pytestmark = pytest.mark.cli

ligo/gracedb/cli/commands/tests/test_delete.py

@@ -2,10 +2,7 @@
 #  Ex: 'gracedb delete signoff'
 import pytest
 import shlex
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 # Apply module-level mark
 pytestmark = pytest.mark.cli

ligo/gracedb/cli/commands/tests/test_get.py

@@ -2,10 +2,7 @@
 #  Ex: 'gracedb get superevent'
 import pytest
 import shlex
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 # Apply module-level mark
 pytestmark = pytest.mark.cli

ligo/gracedb/cli/commands/tests/test_level1_commands.py

@@ -3,10 +3,7 @@
 #  NOT 'gracedb confirm_as_gw' because it has no subcommands.
 import re
 import pytest
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 # Apply module-level mark
 pytestmark = pytest.mark.cli

ligo/gracedb/cli/commands/tests/test_level1_subcommands.py

@@ -3,10 +3,7 @@
 #  NOT 'gracedb add' because it has subcommands like 'gracedb add event'
 import pytest
 import six
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 from ligo.gracedb.cli.commands.subcommands import InfoCommand
 

ligo/gracedb/cli/commands/tests/test_level2_subcommands_help.py

 # Tests for level 2 subcommand help
 #  Ex: 'gracedb add event'
 import pytest
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 from .test_level1_commands import COMMANDS_TEST_DATA
 

ligo/gracedb/cli/commands/tests/test_list.py

@@ -2,10 +2,7 @@
 #  Ex: 'gracedb list labels'
 import pytest
 import shlex
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 # Apply module-level mark
 pytestmark = pytest.mark.cli

ligo/gracedb/cli/commands/tests/test_remove.py

@@ -2,10 +2,7 @@
 #  Ex: 'gracedb remove event'
 import pytest
 import shlex
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 # Apply module-level mark
 pytestmark = pytest.mark.cli

ligo/gracedb/cli/commands/tests/test_search.py

@@ -2,10 +2,7 @@
 #  Ex: 'gracedb create emobservation'
 import pytest
 import shlex
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 # Apply module-level mark
 pytestmark = pytest.mark.cli

ligo/gracedb/cli/commands/tests/test_update.py

@@ -2,10 +2,7 @@
 #  Ex: 'gracedb create emobservation'
 import pytest
 import shlex
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 # Apply module-level mark
 pytestmark = pytest.mark.cli

ligo/gracedb/cli/tests/test_cli.py

 import re
 import pytest
 import six
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 # Add module-level mark
 pytestmark = pytest.mark.cli

ligo/gracedb/cli/tests/test_main.py

 import json
 import pytest
-# import six
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 from ligo.gracedb.exceptions import HTTPError
 from requests import Response

ligo/gracedb/test/conftest.py

 import datetime
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 from cryptography import x509
 from cryptography.x509.oid import NameOID

ligo/gracedb/test/test_certificate.py

 import itertools
 import pytest
-try:
-    from unittest import mock
-except ImportError:  # py < 3
-    import mock
+from unittest import mock
 
 from ligo.gracedb.rest import GraceDb
 from ligo.gracedb.cert import check_certificate_expiration

ligo/gracedb/test/test_emobservations.py

-try:
-    from unittest import mock
-except ImportError:  # python < 3
-    import mock
+from unittest import mock
 
 import pytest
 

ligo/gracedb/test/test_events.py

-try:
-    from unittest import mock
-except ImportError:  # python < 3
-    import mock
+from unittest import mock
 import six
 
 import pytest

ligo/gracedb/test/test_files.py

-try:
-    from unittest import mock
-except ImportError:  # python < 3
-    import mock
 import os
+from unittest import mock
 
 import pytest
 

ligo/gracedb/test/test_labels.py

-try:
-    from unittest import mock
-except ImportError:  # python < 3
-    import mock
+from unittest import mock
 
 import pytest
 

ligo/gracedb/test/test_logging.py

 import logging
-try:
-    from unittest import mock
-except ImportError:  # py < 3
-    import mock
 import time
 import types
+from unittest import mock
 
 from ligo.gracedb.logging import GraceDbLogHandler