From fb76ecf3690a52146af8b623cf086805fac31c65 Mon Sep 17 00:00:00 2001 From: John Evans Date: Sat, 13 Jul 2013 07:39:42 -0400 Subject: [PATCH] Python 2.6 has no unittest module, use unittest2 instead. #75 --- glymur/lib/test/test_openjp2.py | 6 +++++- glymur/lib/test/test_openjpeg.py | 6 +++++- glymur/test/test_callbacks.py | 6 +++++- glymur/test/test_codestream.py | 6 +++++- glymur/test/test_config.py | 7 ++++++- glymur/test/test_icc.py | 7 ++++++- glymur/test/test_jp2box.py | 7 ++++++- glymur/test/test_jp2k.py | 7 ++++++- glymur/test/test_opj_suite.py | 7 ++++++- glymur/test/test_opj_suite_neg.py | 7 ++++++- glymur/test/test_opj_suite_write.py | 7 ++++++- glymur/test/test_printing.py | 6 +++++- 12 files changed, 67 insertions(+), 12 deletions(-) diff --git a/glymur/lib/test/test_openjp2.py b/glymur/lib/test/test_openjp2.py index 10b0084..771ff7a 100644 --- a/glymur/lib/test/test_openjp2.py +++ b/glymur/lib/test/test_openjp2.py @@ -6,7 +6,11 @@ import shutil import struct import sys import tempfile -import unittest + +if sys.hexversion < 0x02070000: + import unittest2 as unittest +else: + import unittest import numpy as np diff --git a/glymur/lib/test/test_openjpeg.py b/glymur/lib/test/test_openjpeg.py index 4f2d099..dbf4439 100644 --- a/glymur/lib/test/test_openjpeg.py +++ b/glymur/lib/test/test_openjpeg.py @@ -1,6 +1,10 @@ #pylint: disable-all import ctypes -import unittest + +if sys.hexversion < 0x02070000: + import unittest2 as unittest +else: + import unittest import glymur diff --git a/glymur/test/test_callbacks.py b/glymur/test/test_callbacks.py index bb6ea07..d1a06c5 100644 --- a/glymur/test/test_callbacks.py +++ b/glymur/test/test_callbacks.py @@ -4,7 +4,6 @@ import pkg_resources import re import sys import tempfile -import unittest import warnings if sys.hexversion < 0x03000000: @@ -12,6 +11,11 @@ if sys.hexversion < 0x03000000: else: from io import StringIO +if sys.hexversion < 0x02070000: + import unittest2 as unittest +else: + import unittest + import glymur diff --git a/glymur/test/test_codestream.py b/glymur/test/test_codestream.py index d2e3b11..87d7df1 100644 --- a/glymur/test/test_codestream.py +++ b/glymur/test/test_codestream.py @@ -3,7 +3,11 @@ import os import struct import sys import tempfile -import unittest + +if sys.hexversion < 0x02070000: + import unittest2 as unittest +else: + import unittest import numpy as np import pkg_resources diff --git a/glymur/test/test_config.py b/glymur/test/test_config.py index bcc2327..126599e 100644 --- a/glymur/test/test_config.py +++ b/glymur/test/test_config.py @@ -7,7 +7,12 @@ import imp import os import sys import tempfile -import unittest + +if sys.hexversion < 0x02070000: + import unittest2 as unittest +else: + import unittest + if sys.hexversion <= 0x03030000: from mock import patch else: diff --git a/glymur/test/test_icc.py b/glymur/test/test_icc.py index 30b4dc0..4334645 100644 --- a/glymur/test/test_icc.py +++ b/glymur/test/test_icc.py @@ -4,7 +4,12 @@ import os import struct import sys import tempfile -import unittest + +if sys.hexversion < 0x02070000: + import unittest2 as unittest +else: + import unittest + import warnings from xml.etree import cElementTree as ET diff --git a/glymur/test/test_jp2box.py b/glymur/test/test_jp2box.py index 72bb476..72c1f1e 100644 --- a/glymur/test/test_jp2box.py +++ b/glymur/test/test_jp2box.py @@ -1,9 +1,14 @@ #pylint: disable-all import doctest import os +import sys import tempfile import xml.etree.cElementTree as ET -import unittest + +if sys.hexversion < 0x02070000: + import unittest2 as unittest +else: + import unittest import numpy as np import pkg_resources diff --git a/glymur/test/test_jp2k.py b/glymur/test/test_jp2k.py index 3c1197d..fa61f15 100644 --- a/glymur/test/test_jp2k.py +++ b/glymur/test/test_jp2k.py @@ -7,7 +7,12 @@ import struct import sys import tempfile import uuid -import unittest + +if sys.hexversion < 0x02070000: + import unittest2 as unittest +else: + import unittest + if sys.hexversion <= 0x03030000: from mock import patch else: diff --git a/glymur/test/test_opj_suite.py b/glymur/test/test_opj_suite.py index 41d4f8b..ead37ef 100644 --- a/glymur/test/test_opj_suite.py +++ b/glymur/test/test_opj_suite.py @@ -10,7 +10,12 @@ import platform import re import sys from xml.etree import cElementTree as ET -import unittest + +if sys.hexversion < 0x02070000: + import unittest2 as unittest +else: + import unittest + import warnings if sys.hexversion <= 0x03030000: diff --git a/glymur/test/test_opj_suite_neg.py b/glymur/test/test_opj_suite_neg.py index 8a89d09..d3c74aa 100644 --- a/glymur/test/test_opj_suite_neg.py +++ b/glymur/test/test_opj_suite_neg.py @@ -6,7 +6,12 @@ seem like logical negative tests to add. import os import sys import tempfile -import unittest + +if sys.hexversion < 0x02070000: + import unittest2 as unittest +else: + import unittest + import warnings import numpy as np diff --git a/glymur/test/test_opj_suite_write.py b/glymur/test/test_opj_suite_write.py index 4023239..6b757d5 100644 --- a/glymur/test/test_opj_suite_write.py +++ b/glymur/test/test_opj_suite_write.py @@ -7,7 +7,12 @@ import os import platform import sys import tempfile -import unittest + +if sys.hexversion < 0x02070000: + import unittest2 as unittest +else: + import unittest + import warnings import numpy as np diff --git a/glymur/test/test_printing.py b/glymur/test/test_printing.py index 3b920cc..37a36b3 100644 --- a/glymur/test/test_printing.py +++ b/glymur/test/test_printing.py @@ -4,7 +4,11 @@ import pkg_resources import struct import sys import tempfile -import unittest + +if sys.hexversion < 0x02070000: + import unittest2 as unittest +else: + import unittest if sys.hexversion < 0x03000000: from StringIO import StringIO