From: Georg Brandl <georg@python.org>
Date: Thu, 13 Aug 2009 09:15:16 +0000 (+0000)
Subject: Merged revisions 74010,74034,74054 via svnmerge from
X-Git-Tag: v3.1.1rc1~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c3c6fed6fe282ca2aedb9b15904bde63218dfc86;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 74010,74034,74054 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

................
  r74010 | r.david.murray | 2009-07-15 16:16:54 +0200 (Mi, 15 Jul 2009) | 2 lines

  PEP-8-ify r73389.
................
  r74034 | alexandre.vassalotti | 2009-07-17 07:35:59 +0200 (Fr, 17 Jul 2009) | 2 lines

  The output() function takes only one string argument.
................
  r74054 | alexandre.vassalotti | 2009-07-17 10:31:44 +0200 (Fr, 17 Jul 2009) | 14 lines

  Merged revisions 74051-74052 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r74051 | alexandre.vassalotti | 2009-07-17 03:54:23 -0400 (Fri, 17 Jul 2009) | 2 lines

    Initialize variables in PyCurses_getsyx() to avoid compiler warnings.
  ........
    r74052 | alexandre.vassalotti | 2009-07-17 04:09:04 -0400 (Fri, 17 Jul 2009) | 3 lines

    Fix GCC warning about fprintf used without a string literal and
    without format arguments.
  ........
................
---

diff --git a/Lib/doctest.py b/Lib/doctest.py
index 3d053d9bfdf7..b95566f6c68c 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -821,7 +821,8 @@ class DocTestFinder:
                 # (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 a92cc8e13592..c7d377859d2d 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 8352e6672220..22794dafb9b7 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 28a713879789..ca91b6e2a0a0 100644
--- a/Parser/asdl.py
+++ b/Parser/asdl.py
@@ -323,8 +323,8 @@ class VisitorBase(object):
         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'):