summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2016-08-27 19:14:32 -0500
committerBryan Bishop <kanzure@gmail.com>2016-08-27 19:14:32 -0500
commit85ee624293900c78e9b02f1fcb4aa00c5b2140a5 (patch)
tree8e2918a2846a6eb2e25bade954539f8f549045e3
parent30ec94681f8dda48cd66ecdbf1d7a0a82666f145 (diff)
import unittest.mock as mock
-rw-r--r--tests/integration/tests.py6
-rw-r--r--tests/tests.py6
2 files changed, 10 insertions, 2 deletions
diff --git a/tests/integration/tests.py b/tests/integration/tests.py
index 79fadda..024feab 100644
--- a/tests/integration/tests.py
+++ b/tests/integration/tests.py
@@ -99,7 +99,11 @@ from pokemontools.crystal import (
import pokemontools.wram
import unittest
-import mock
+
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
class BasicTestCase(unittest.TestCase):
"this is where i cram all of my unit tests together"
diff --git a/tests/tests.py b/tests/tests.py
index 4c7f7a4..13b1e49 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -95,7 +95,11 @@ from pokemontools.crystal import (
)
import unittest
-import mock
+
+try:
+ import unittest.mock as mock
+except ImportError:
+ import mock
class TestCram(unittest.TestCase):
"this is where i cram all of my unit tests together"