Author: Matti Picus <matti.pi...@gmail.com>
Branch: unicode-utf8-py3
Changeset: r95113:53b278863286
Date: 2018-09-12 17:16 +0300
http://bitbucket.org/pypy/pypy/changeset/53b278863286/
Log: merge py3.5 into branch
diff --git a/pypy/module/cpyext/test0/__init__.py
b/pypy/module/cpyext/test0/__init__.py
deleted file mode 100644
diff --git a/pypy/module/cpyext/test0/conftest.py
b/pypy/module/cpyext/test0/conftest.py
deleted file mode 100644
--- a/pypy/module/cpyext/test0/conftest.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import os
-import pytest
-
-def pytest_configure(config):
- if config.option.runappdirect:
- import sys
- import py
- from pypy import pypydir
- sys.path.append(str(py.path.local(pypydir) / 'tool' / 'cpyext'))
- return
- from pypy.tool.pytest.objspace import gettestobjspace
- # For some reason (probably a ll2ctypes cache issue on linux64)
- # it's necessary to run "import time" at least once before any
- # other cpyext test, otherwise the same statement will fail in
- # test_datetime.py.
- space = gettestobjspace(usemodules=['time'])
- space.getbuiltinmodule("time")
-
-def pytest_ignore_collect(path, config):
- # ensure additional functions are registered
- import pypy.module.cpyext.test.test_cpyext
- return False
-
-def pytest_funcarg__api(request):
- return request.cls.api
-
-if os.name == 'nt':
- @pytest.yield_fixture(autouse=True, scope='session')
- def prevent_dialog_box():
- """Do not open dreaded dialog box on segfault on Windows"""
- import ctypes
- SEM_NOGPFAULTERRORBOX = 0x0002 # From MSDN
- old_err_mode = ctypes.windll.kernel32.GetErrorMode()
- new_err_mode = old_err_mode | SEM_NOGPFAULTERRORBOX
- ctypes.windll.kernel32.SetErrorMode(new_err_mode)
- yield
- ctypes.windll.kernel32.SetErrorMode(old_err_mode)
diff --git a/pypy/module/cpyext/test1/__init__.py
b/pypy/module/cpyext/test1/__init__.py
deleted file mode 100644
diff --git a/pypy/module/cpyext/test1/conftest.py
b/pypy/module/cpyext/test1/conftest.py
deleted file mode 100644
--- a/pypy/module/cpyext/test1/conftest.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import os
-import pytest
-
-def pytest_configure(config):
- if config.option.runappdirect:
- import sys
- import py
- from pypy import pypydir
- sys.path.append(str(py.path.local(pypydir) / 'tool' / 'cpyext'))
- return
- from pypy.tool.pytest.objspace import gettestobjspace
- # For some reason (probably a ll2ctypes cache issue on linux64)
- # it's necessary to run "import time" at least once before any
- # other cpyext test, otherwise the same statement will fail in
- # test_datetime.py.
- space = gettestobjspace(usemodules=['time'])
- space.getbuiltinmodule("time")
-
-def pytest_ignore_collect(path, config):
- # ensure additional functions are registered
- import pypy.module.cpyext.test.test_cpyext
- return False
-
-def pytest_funcarg__api(request):
- return request.cls.api
-
-if os.name == 'nt':
- @pytest.yield_fixture(autouse=True, scope='session')
- def prevent_dialog_box():
- """Do not open dreaded dialog box on segfault on Windows"""
- import ctypes
- SEM_NOGPFAULTERRORBOX = 0x0002 # From MSDN
- old_err_mode = ctypes.windll.kernel32.GetErrorMode()
- new_err_mode = old_err_mode | SEM_NOGPFAULTERRORBOX
- ctypes.windll.kernel32.SetErrorMode(new_err_mode)
- yield
- ctypes.windll.kernel32.SetErrorMode(old_err_mode)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
