Commit dfb3eb68 authored by Robert Bradshaw's avatar Robert Bradshaw

merge

parents 220bbadc 594ba31d
version = '0.12.rc0' version = '0.12.rc1'
...@@ -444,7 +444,8 @@ class CythonRunTestCase(CythonCompileTestCase): ...@@ -444,7 +444,8 @@ class CythonRunTestCase(CythonCompileTestCase):
raise Exception("Tests in module '%s' exited with status %d" % raise Exception("Tests in module '%s' exited with status %d" %
(module_name, result_code >> 8)) (module_name, result_code >> 8))
finally: finally:
os.unlink(result_file) try: os.unlink(result_file)
except: pass
is_private_field = re.compile('^_[^_]').match is_private_field = re.compile('^_[^_]').match
......
...@@ -7,6 +7,11 @@ compiler_dir = os.path.join(get_python_lib(prefix=''), 'Cython/Compiler') ...@@ -7,6 +7,11 @@ compiler_dir = os.path.join(get_python_lib(prefix=''), 'Cython/Compiler')
if sys.platform == "win32": if sys.platform == "win32":
compiler_dir = compiler_dir[len(sys.prefix)+1:] compiler_dir = compiler_dir[len(sys.prefix)+1:]
if sys.platform == "darwin":
# Don't create resource files on OS X tar.
os.environ['COPY_EXTENDED_ATTRIBUTES_DISABLE'] = 'true'
os.environ['COPYFILE_DISABLE'] = 'true'
setup_args = {} setup_args = {}
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
......
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