[Python-checkins] r74397 - in python/branches/release31-maint: Lib/doctest.py Modules/_cursesmodule.c Modules/main.c Parser/asdl.py

[georg.brandl]

Author: georg.brandl
Date: Thu Aug 13 11:15:16 2009
New Revision: 74397

Log:
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.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/doctest.py
   python/branches/release31-maint/Modules/_cursesmodule.c
   python/branches/release31-maint/Modules/main.c
   python/branches/release31-maint/Parser/asdl.py

Modified: python/branches/release31-maint/Lib/doctest.py
==============================================================================
--- python/branches/release31-maint/Lib/doctest.py	(original)
+++ python/branches/release31-maint/Lib/doctest.py	Thu Aug 13 11:15:16 2009
@@ -821,7 +821,8 @@
                 # (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

Modified: python/branches/release31-maint/Modules/_cursesmodule.c
==============================================================================
--- python/branches/release31-maint/Modules/_cursesmodule.c	(original)
+++ python/branches/release31-maint/Modules/_cursesmodule.c	Thu Aug 13 11:15:16 2009
@@ -1806,7 +1806,8 @@
 static PyObject *
 PyCurses_getsyx(PyObject *self)
 {
-  int x,y;
+  int x = 0;
+  int y = 0;
 
   PyCursesInitialised
 

Modified: python/branches/release31-maint/Modules/main.c
==============================================================================
--- python/branches/release31-maint/Modules/main.c	(original)
+++ python/branches/release31-maint/Modules/main.c	Thu Aug 13 11:15:16 2009
@@ -131,9 +131,9 @@
 	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);
 	}

Modified: python/branches/release31-maint/Parser/asdl.py
==============================================================================
--- python/branches/release31-maint/Parser/asdl.py	(original)
+++ python/branches/release31-maint/Parser/asdl.py	Thu Aug 13 11:15:16 2009
@@ -323,8 +323,8 @@
         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'):