Skip to content

Commit 5349992

Browse files
author
Bartek Ogryczak
committed
no need to use anything else than unittest2 when Py2.6
1 parent 128d918 commit 5349992

File tree

6 files changed

+25
-13
lines changed

6 files changed

+25
-13
lines changed

pymysqlreplication/tests/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,8 @@
55
from pymysqlreplication.tests.test_data_objects import *
66

77
if __name__ == "__main__":
8-
import unittest
8+
if sys.version_info < (2, 7):
9+
import unittest2 as unittest
10+
else:
11+
import unittest
912
unittest.main()

pymysqlreplication/tests/base.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
# -*- coding: utf-8 -*-
22

33
import pymysql
4-
import unittest
54
import copy
65
from pymysqlreplication import BinLogStreamReader
76
import os
87
import sys
98

10-
(major, minor, _, _, _) = sys.version_info
11-
if (major, minor) < (2, 7):
12-
import unittest2
13-
base = unittest2.TestCase
9+
if sys.version_info < (2, 7):
10+
import unittest2 as unittest
1411
else:
15-
base = unittest.TestCase
12+
import unittest
13+
14+
base = unittest.TestCase
1615

1716

1817
class PyMySQLReplicationTestCase(base):

pymysqlreplication/tests/test_basic.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# -*- coding: utf-8 -*-
2-
import unittest
3-
42
import time
3+
import sys
4+
if sys.version_info < (2, 7):
5+
import unittest2 as unittest
6+
else:
7+
import unittest
58

69
from pymysqlreplication.tests import base
710
from pymysqlreplication import BinLogStreamReader

pymysqlreplication/tests/test_data_objects.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
import unittest
1+
import sys
2+
if sys.version_info < (2, 7):
3+
import unittest2 as unittest
4+
else:
5+
import unittest
26

37
from pymysqlreplication.column import Column
48
from pymysqlreplication.table import Table

pymysqlreplication/tests/test_data_type.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
import copy
44
import platform
5-
import unittest
5+
import sys
6+
if sys.version_info < (2, 7):
7+
import unittest2 as unittest
8+
else:
9+
import unittest
610

711
from decimal import Decimal
812

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
install_requires = ['pymysql']
1212

1313
# add unittest2 to install_requires for python < 2.7
14-
major, minor, _, _, _ = sys.version_info
15-
if (major, minor) < (2, 7):
14+
if sys.version_info < (2, 7):
1615
install_requires.append("unittest2")
1716

1817

0 commit comments

Comments
 (0)