Merge branch 'issue255' into devel

This commit is contained in:
John Evans 2014-09-10 11:22:19 -04:00
commit 2252519b2d

View file

@ -8,6 +8,7 @@ Test suite for warnings issued by glymur.
import os import os
import re import re
import struct import struct
import six
import sys import sys
import tempfile import tempfile
import unittest import unittest
@ -20,6 +21,8 @@ from .fixtures import opj_data_file, OPJ_DATA_ROOT
@unittest.skipIf(sys.hexversion < 0x03030000, @unittest.skipIf(sys.hexversion < 0x03030000,
"assertWarn methods introduced in 3.x") "assertWarn methods introduced in 3.x")
@unittest.skipIf(re.match('1.[0-6]', six.__version__) is not None,
"Problem with earlier versions of six on python3")
@unittest.skipIf(OPJ_DATA_ROOT is None, @unittest.skipIf(OPJ_DATA_ROOT is None,
"OPJ_DATA_ROOT environment variable not set") "OPJ_DATA_ROOT environment variable not set")
class TestWarnings(unittest.TestCase): class TestWarnings(unittest.TestCase):