Commit 20014568 authored by Marius Wachtler's avatar Marius Wachtler

Update pypa to fix a mssing new line problem and set corrent distutils install directory

+ fix a test failing because of a slightly different error message than cpython 2.7.8
parent 65c719a2
......@@ -41,8 +41,11 @@ else:
INSTALL_SCHEMES = {
'unix_prefix': {
'purelib': '$base/lib/python$py_version_short/site-packages',
'platlib': '$platbase/lib/python$py_version_short/site-packages',
# Pyston change
# 'purelib': '$base/lib/python$py_version_short/site-packages',
# 'platlib': '$platbase/lib/python$py_version_short/site-packages',
'purelib': '$base/site-packages',
'platlib': '$base/site-packages',
'headers': '$base/include/python$py_version_short/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
......
Subproject commit 0a2bbff17a4f8e0270c64423004b5613457e59db
Subproject commit 98d769dcd3a792f70b5e9c9bb9afa7544a50ae4a
......@@ -622,7 +622,10 @@ static void raiseNameForcingSyntaxError(const char* msg, ScopingAnalysis::ScopeN
syntaxElemMsg = "import * is not allowed in function '%s' because it %s";
lineno = usage->nameForcingNodeImportStar->lineno;
} else {
if (PYTHON_VERSION_MAJOR == 2 && PYTHON_VERSION_MINOR == 7 && PYTHON_VERSION_MICRO < 8)
syntaxElemMsg = "unqualified exec is not allowed in function '%.100s' it %s";
else
syntaxElemMsg = "unqualified exec is not allowed in function '%.100s' because it %s";
lineno = usage->nameForcingNodeBareExec->lineno;
}
......
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