Implemented PEP 370
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index a9b7f81..e1483aa 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -82,6 +82,7 @@
on the command line, and is used in 2.2 by ceval.c to make all "/" divisions
true divisions (which they will be in 2.3). */
int _Py_QnewFlag = 0;
+int Py_NoUserSiteDirectory = 0; /* for -s and site.py */
/* PyModule_GetWarningsModule is no longer necessary as of 2.6
since _warnings is builtin. This API should not be used. */
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index a9ab6a7..8a1ef3c 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1101,7 +1101,7 @@
shortbranch[len] = '\0';
}
else {
- Py_FatalError("bad HeadURL");
+ Py_FatalError("bad HeadURL");
return;
}
@@ -1158,7 +1158,7 @@
{"interactive", "-i"},
{"optimize", "-O or -OO"},
{"dont_write_bytecode", "-B"},
- /* {"no_user_site", "-s"}, */
+ {"no_user_site", "-s"},
{"no_site", "-S"},
{"ignore_environment", "-E"},
{"tabcheck", "-t or -tt"},
@@ -1178,9 +1178,9 @@
flags__doc__, /* doc */
flags_fields, /* fields */
#ifdef RISCOS
- 14
+ 15
#else
- 13
+ 14
#endif
};
@@ -1205,7 +1205,7 @@
SetFlag(Py_InteractiveFlag);
SetFlag(Py_OptimizeFlag);
SetFlag(Py_DontWriteBytecodeFlag);
- /* SetFlag(Py_NoUserSiteDirectory); */
+ SetFlag(Py_NoUserSiteDirectory);
SetFlag(Py_NoSiteFlag);
SetFlag(Py_IgnoreEnvironmentFlag);
SetFlag(Py_TabcheckFlag);