Kaydet (Commit) d08e3824 authored tarafından Tim Peters's avatar Tim Peters

Trimmed trailing whitespace.

üst 9cf25ce3
...@@ -113,7 +113,7 @@ Py_Initialize(void) ...@@ -113,7 +113,7 @@ Py_Initialize(void)
if (initialized) if (initialized)
return; return;
initialized = 1; initialized = 1;
if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0') if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0')
Py_DebugFlag = add_flag(Py_DebugFlag, p); Py_DebugFlag = add_flag(Py_DebugFlag, p);
if ((p = Py_GETENV("PYTHONVERBOSE")) && *p != '\0') if ((p = Py_GETENV("PYTHONVERBOSE")) && *p != '\0')
...@@ -523,7 +523,7 @@ PyRun_AnyFileEx(FILE *fp, const char *filename, int closeit) ...@@ -523,7 +523,7 @@ PyRun_AnyFileEx(FILE *fp, const char *filename, int closeit)
} }
int int
PyRun_AnyFileExFlags(FILE *fp, const char *filename, int closeit, PyRun_AnyFileExFlags(FILE *fp, const char *filename, int closeit,
PyCompilerFlags *flags) PyCompilerFlags *flags)
{ {
if (filename == NULL) if (filename == NULL)
...@@ -688,14 +688,14 @@ maybe_pyc_file(FILE *fp, const char* filename, const char* ext, int closeit) ...@@ -688,14 +688,14 @@ maybe_pyc_file(FILE *fp, const char* filename, const char* ext, int closeit)
int ispyc = 0; int ispyc = 0;
if (ftell(fp) == 0) { if (ftell(fp) == 0) {
if (fread(buf, 1, 2, fp) == 2 && if (fread(buf, 1, 2, fp) == 2 &&
((unsigned int)buf[1]<<8 | buf[0]) == halfmagic) ((unsigned int)buf[1]<<8 | buf[0]) == halfmagic)
ispyc = 1; ispyc = 1;
rewind(fp); rewind(fp);
} }
return ispyc; return ispyc;
} }
return 0; return 0;
} }
int int
PyRun_SimpleFileEx(FILE *fp, const char *filename, int closeit) PyRun_SimpleFileEx(FILE *fp, const char *filename, int closeit)
...@@ -738,7 +738,7 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit, ...@@ -738,7 +738,7 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
Py_OptimizeFlag = 1; Py_OptimizeFlag = 1;
v = run_pyc_file(fp, filename, d, d, flags); v = run_pyc_file(fp, filename, d, d, flags);
} else { } else {
v = PyRun_FileExFlags(fp, filename, Py_file_input, d, d, v = PyRun_FileExFlags(fp, filename, Py_file_input, d, d,
closeit, flags); closeit, flags);
} }
if (v == NULL) { if (v == NULL) {
...@@ -1017,7 +1017,7 @@ void PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb) ...@@ -1017,7 +1017,7 @@ void PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb)
err = PyFile_WriteString("<unknown>", f); err = PyFile_WriteString("<unknown>", f);
else { else {
char* modstr = PyString_AsString(moduleName); char* modstr = PyString_AsString(moduleName);
if (modstr && strcmp(modstr, "exceptions")) if (modstr && strcmp(modstr, "exceptions"))
{ {
err = PyFile_WriteString(modstr, f); err = PyFile_WriteString(modstr, f);
err += PyFile_WriteString(".", f); err += PyFile_WriteString(".", f);
...@@ -1096,7 +1096,7 @@ PyRun_FileFlags(FILE *fp, const char *filename, int start, PyObject *globals, ...@@ -1096,7 +1096,7 @@ PyRun_FileFlags(FILE *fp, const char *filename, int start, PyObject *globals,
PyObject *locals, PyCompilerFlags *flags) PyObject *locals, PyCompilerFlags *flags)
{ {
return PyRun_FileExFlags(fp, filename, start, globals, locals, 0, return PyRun_FileExFlags(fp, filename, start, globals, locals, 0,
flags); flags);
} }
PyObject * PyObject *
...@@ -1173,7 +1173,7 @@ Py_CompileString(const char *str, const char *filename, int start) ...@@ -1173,7 +1173,7 @@ Py_CompileString(const char *str, const char *filename, int start)
} }
PyObject * PyObject *
Py_CompileStringFlags(const char *str, const char *filename, int start, Py_CompileStringFlags(const char *str, const char *filename, int start,
PyCompilerFlags *flags) PyCompilerFlags *flags)
{ {
node *n; node *n;
...@@ -1249,7 +1249,7 @@ PyParser_SimpleParseStringFlagsFilename(const char *str, const char *filename, ...@@ -1249,7 +1249,7 @@ PyParser_SimpleParseStringFlagsFilename(const char *str, const char *filename,
node *n; node *n;
perrdetail err; perrdetail err;
n = PyParser_ParseStringFlagsFilename(str, filename, n = PyParser_ParseStringFlagsFilename(str, filename,
&_PyParser_Grammar, &_PyParser_Grammar,
start, &err, flags); start, &err, flags);
if (n == NULL) if (n == NULL)
...@@ -1481,7 +1481,7 @@ Py_FdIsInteractive(FILE *fp, const char *filename) ...@@ -1481,7 +1481,7 @@ Py_FdIsInteractive(FILE *fp, const char *filename)
} }
#if defined(USE_STACKCHECK) #if defined(USE_STACKCHECK)
#if defined(WIN32) && defined(_MSC_VER) #if defined(WIN32) && defined(_MSC_VER)
/* Stack checking for Microsoft C */ /* Stack checking for Microsoft C */
......
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