python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-15 18:52:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed test on python27 OMM

Browse Source
This commit is contained in:
Eric Soroos 2017-01-11 14:12:31 -08:00 committed by wiredfool
parent 878881b1b9
commit 6c1f923368
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Tests/test_image_access.py
View File

@ -250,10 +250,14 @@ class TestCffi(AccessTest):
class TestEmbeddable(unittest.TestCase): class TestEmbeddable(unittest.TestCase):
@unittest.skipIf(not sys.platform.startswith('win32'), "requires Windows") @unittest.skipIf(not sys.platform.startswith('win32') or
sys.version_info[:2] in ((3, 3), (3, 4)),
"requires Python 2.7 or >=3.5 for Windows")
def test_embeddable(self): def test_embeddable(self):
import subprocess import subprocess
from distutils import ccompiler import ctypes
import setuptools
from distutils import ccompiler, sysconfig
with open('embed_pil.c', 'w') as fh: with open('embed_pil.c', 'w') as fh:
fh.write(""" fh.write("""
@ -261,25 +265,43 @@ class TestEmbeddable(unittest.TestCase):
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
Py_SetPythonHome( "%s" ); char *home = "%s";
#if PY_MAJOR_VERSION >= 3
wchar_t *whome = Py_DecodeLocale(home, NULL);
Py_SetPythonHome(whome);
#else
Py_SetPythonHome(home);
#endif
Py_InitializeEx( 0 ); Py_InitializeEx(0);
Py_DECREF(PyImport_ImportModule( "PIL.Image" )); Py_DECREF(PyImport_ImportModule("PIL.Image"));
Py_Finalize(); Py_Finalize();
Py_InitializeEx( 0 ); Py_InitializeEx(0);
Py_DECREF(PyImport_ImportModule( "PIL.Image" )); Py_DECREF(PyImport_ImportModule("PIL.Image"));
Py_Finalize(); Py_Finalize();
#if PY_MAJOR_VERSION >= 3
PyMem_RawFree(whome);
#endif
return 0; return 0;
} }
""" % sys.prefix.replace('\\', '\\\\')) """ % sys.prefix.replace('\\', '\\\\'))
compiler = ccompiler.new_compiler() compiler = ccompiler.new_compiler()
compiler.add_include_dir(sysconfig.get_python_inc())
compiler.add_library_dir(sysconfig.get_config_var('LIBDIR'))
objects = compiler.compile(['embed_pil.c']) objects = compiler.compile(['embed_pil.c'])
compiler.link_executable(objects, 'embed_pil') compiler.link_executable(objects, 'embed_pil')
subprocess.call(['embed_pil.exe']) # do not display the Windows Error Reporting dialog
ctypes.windll.kernel32.SetErrorMode(0x0002)
process = subprocess.Popen(['embed_pil.exe'])
process.communicate()
self.assertEqual(process.returncode, 0)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()