Skip to content

Commit 86111da

Browse files
committed
Remove Python 2 test code
1 parent 5157fa5 commit 86111da

File tree

3 files changed

+4
-28
lines changed

3 files changed

+4
-28
lines changed

tests/database_test.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import ipaddress
77
import sys
8+
import unittest
89

910
sys.path.append("..")
1011

@@ -14,16 +15,7 @@
1415
try:
1516
import maxminddb.extension
1617
except ImportError:
17-
maxminddb.extension = None
18-
19-
if sys.version_info[:2] == (2, 6):
20-
import unittest2 as unittest
21-
else:
22-
import unittest
23-
24-
if sys.version_info[0] == 2:
25-
unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
26-
unittest.TestCase.assertRegex = unittest.TestCase.assertRegexpMatches
18+
maxminddb.extension = None # type: ignore
2719

2820

2921
class BaseTestReader(unittest.TestCase):

tests/models_test.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,12 @@
55

66
import sys
77
from typing import Dict
8+
import unittest
89

910
sys.path.append("..")
1011

1112
import geoip2.models
1213

13-
if sys.version_info[:2] == (2, 6):
14-
import unittest2 as unittest
15-
else:
16-
import unittest
17-
18-
if sys.version_info[0] == 2:
19-
unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
20-
unittest.TestCase.assertRegex = unittest.TestCase.assertRegexpMatches
21-
2214

2315
class TestModels(unittest.TestCase):
2416
def test_insights_full(self) -> None:

tests/webservice_test.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import ipaddress
66
import sys
77
from typing import cast, Dict
8+
import unittest
89

910
sys.path.append("..")
1011

@@ -21,15 +22,6 @@
2122
)
2223
from geoip2.webservice import Client
2324

24-
if sys.version_info[:2] == (2, 6):
25-
import unittest2 as unittest
26-
else:
27-
import unittest
28-
29-
if sys.version_info[0] == 2:
30-
unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
31-
unittest.TestCase.assertRegex = unittest.TestCase.assertRegexpMatches
32-
3325

3426
class TestClient(unittest.TestCase):
3527
def setUp(self):

0 commit comments

Comments
 (0)