Commit 152e9d58 authored by Robert Bradshaw's avatar Robert Bradshaw

Merge branch 'master' of github.com:cython/cython

parents c430314b 4a7e320c
......@@ -1494,20 +1494,18 @@ class VersionDependencyExcluder:
return True
return False
class FileListExcluder:
def __init__(self, list_file, verbose=False):
self.verbose = verbose
self.excludes = {}
self._list_file = list_file
f = open(list_file)
try:
for line in f.readlines():
self._list_file = os.path.relpath(list_file)
with open(list_file) as f:
for line in f:
line = line.strip()
if line and line[0] != '#':
self.excludes[line.split()[0]] = True
finally:
f.close()
def __call__(self, testname, tags=None):
exclude = (testname in self.excludes
......@@ -1517,6 +1515,7 @@ class FileListExcluder:
% (testname, self._list_file))
return exclude
class TagsSelector:
def __init__(self, tag, value):
......
......@@ -75,12 +75,12 @@ def runloop(task):
result = loop.run_until_complete(task())
assert 3 == result, result
import import_asyncio # patches Generator into ABCs if necessary
import import_asyncio # patches Generator into ABCs if missing
runloop(import_asyncio.wait3) # 1a)
import from_asyncio_import
runloop(from_asyncio_import.wait3) # 1b)
import async_def # patches Awaitable/Coroutine into ABCs if necessary
import async_def # patches Awaitable/Coroutine into ABCs if missing
if ASYNCIO_SUPPORTS_COROUTINE:
runloop(async_def.wait3) # 1c)
......
......@@ -23,7 +23,7 @@ def try_import():
else:
raise RuntimeError("expected ValueError from import")
if sys.version_info >= (3, 3):
if (3, 3) <= sys.version_info < (3, 5):
assert 'fail_in_init' not in sys.modules
elif 'fail_in_init' in sys.modules:
try:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment