merge branch 'issue290' into devel

This commit is contained in:
jevans 2014-10-24 19:33:55 -04:00
commit fa23fddfd8

View file

@ -35,10 +35,11 @@ def openjpeg_not_found_by_ctypes():
Need to know if openjpeg library can be picked right up by ctypes for one
of the tests.
"""
if ctypes.util.find_library('openjpeg') is None:
return True
else:
return False
with patch.dict('os.environ', {'DYLD_FALLBACK_LIBRARY_PATH': '/opt/local/lib'}):
if ctypes.util.find_library('openjpeg') is None:
return True
else:
return False
@unittest.skipIf(sys.hexversion < 0x03020000,