File tree Expand file tree Collapse file tree 2 files changed +1
-22
lines changed
Expand file tree Collapse file tree 2 files changed +1
-22
lines changed Original file line number Diff line number Diff line change 22# -*- coding: utf-8 -*-
33
44import mmap
5- import sys
65
76from maxminddb .decoder import Decoder
87
98import unittest
109
11- if sys .version_info [0 ] == 2 :
12- unittest .TestCase .assertRaisesRegex = unittest .TestCase .assertRaisesRegexp
13- unittest .TestCase .assertRegex = unittest .TestCase .assertRegexpMatches
14-
1510
1611class TestDecoder (unittest .TestCase ):
1712 def test_arrays (self ):
Original file line number Diff line number Diff line change 55import os
66import sys
77import threading
8+ import unittest
89from multiprocessing import Process , Pipe
910
1011import mock
2627 MODE_FD ,
2728)
2829
29- if sys .version_info [:2 ] == (2 , 6 ):
30- import unittest2 as unittest
31- else :
32- import unittest
33-
34- if sys .version_info [0 ] == 2 :
35- unittest .TestCase .assertRaisesRegex = unittest .TestCase .assertRaisesRegexp
36- unittest .TestCase .assertRegex = unittest .TestCase .assertRegexpMatches
37-
3830
3931def get_reader_from_file_descriptor (filepath , mode ):
4032 """Patches open_database() for class TestFDReader()."""
@@ -432,14 +424,6 @@ def test_multiprocessing(self):
432424 def test_threading (self ):
433425 self ._check_concurrency (threading .Thread )
434426
435- if sys .version_info [0 ] == 2 :
436-
437- def test_byte_ip_on_python2 (self ):
438- reader = open_database (
439- "tests/data/test-data/MaxMind-DB-test-decoder.mmdb" , self .mode
440- )
441- record = reader .get (b"::1.1.1.0" )
442-
443427 def _check_concurrency (self , worker_class ):
444428 reader = open_database (
445429 "tests/data/test-data/GeoIP2-Domain-Test.mmdb" , self .mode
You can’t perform that action at this time.
0 commit comments