diff --git a/Lib/doctest.py b/Lib/doctest.py index 3d053d9bfdf..b95566f6c68 100644 --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -821,7 +821,8 @@ def find(self, obj, name=None, module=None, globs=None, extraglobs=None): # (see __patched_linecache_getlines). file = inspect.getfile(obj) if not file[0]+file[-2:] == '<]>': file = None - if file is None: source_lines = None + if file is None: + source_lines = None else: if module is not None: # Supply the module globals in case the module was diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index a92cc8e1359..c7d377859d2 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -1806,7 +1806,8 @@ PyCurses_EraseChar(PyObject *self) static PyObject * PyCurses_getsyx(PyObject *self) { - int x,y; + int x = 0; + int y = 0; PyCursesInitialised diff --git a/Modules/main.c b/Modules/main.c index 8352e667222..22794dafb9b 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -131,9 +131,9 @@ usage(int exitcode, wchar_t* program) if (exitcode) fprintf(f, "Try `python -h' for more information.\n"); else { - fprintf(f, usage_1); - fprintf(f, usage_2); - fprintf(f, usage_3); + fputs(usage_1, f); + fputs(usage_2, f); + fputs(usage_3, f); fprintf(f, usage_4, DELIM); fprintf(f, usage_5, DELIM, PYTHONHOMEHELP); } diff --git a/Parser/asdl.py b/Parser/asdl.py index 28a71387978..ca91b6e2a0a 100644 --- a/Parser/asdl.py +++ b/Parser/asdl.py @@ -323,8 +323,8 @@ def visit(self, object, *args): try: meth(object, *args) except Exception: - output("Error visiting", repr(object)) - output(sys.exc_info()[1]) + output("Error visiting" + repr(object)) + output(str(sys.exc_info()[1])) traceback.print_exc() # XXX hack if hasattr(self, 'file'):