[Python-3000-checkins] r66838 - in python/branches/py3k: Modules/python.c Python/frozenmain.c

amaury.forgeotdarc python-3000-checkins at python.org
Tue Oct 7 23:06:18 CEST 2008


Author: amaury.forgeotdarc
Date: Tue Oct  7 23:06:18 2008
New Revision: 66838

Log:
#4004: Missing newline in some startup error messages.
Patch by Victor.


Modified:
   python/branches/py3k/Modules/python.c
   python/branches/py3k/Python/frozenmain.c

Modified: python/branches/py3k/Modules/python.c
==============================================================================
--- python/branches/py3k/Modules/python.c	(original)
+++ python/branches/py3k/Modules/python.c	Tue Oct  7 23:06:18 2008
@@ -34,7 +34,7 @@
 	fpsetmask(m & ~FP_X_OFL);
 #endif
 	if (!argv_copy || !argv_copy2) {
-		fprintf(stderr, "out of memory");
+		fprintf(stderr, "out of memory\n");
 		return 1;
 	}
 	oldloc = setlocale(LC_ALL, NULL);
@@ -51,18 +51,18 @@
 #endif
 		size_t count;
 		if (argsize == (size_t)-1) {
-			fprintf(stderr, "Could not convert argument %d to string", i);
+			fprintf(stderr, "Could not convert argument %d to string\n", i);
 			return 1;
 		}
 		argv_copy[i] = PyMem_Malloc((argsize+1)*sizeof(wchar_t));
 		argv_copy2[i] = argv_copy[i];
 		if (!argv_copy[i]) {
-			fprintf(stderr, "out of memory");
+			fprintf(stderr, "out of memory\n");
 			return 1;
 		}
 		count = mbstowcs(argv_copy[i], argv[i], argsize+1);
 		if (count == (size_t)-1) {
-			fprintf(stderr, "Could not convert argument %d to string", i);
+			fprintf(stderr, "Could not convert argument %d to string\n", i);
 			return 1;
 		}
 	}

Modified: python/branches/py3k/Python/frozenmain.c
==============================================================================
--- python/branches/py3k/Python/frozenmain.c	(original)
+++ python/branches/py3k/Python/frozenmain.c	Tue Oct  7 23:06:18 2008
@@ -38,7 +38,7 @@
 	}
 
 	if (!argv_copy) {
-		fprintf(stderr, "out of memory");
+		fprintf(stderr, "out of memory\n");
 		return 1;
 	}
 
@@ -52,18 +52,18 @@
 #endif
 		size_t count;
 		if (argsize == (size_t)-1) {
-			fprintf(stderr, "Could not convert argument %d to string", i);
+			fprintf(stderr, "Could not convert argument %d to string\n", i);
 			return 1;
 		}
 		argv_copy[i] = PyMem_Malloc((argsize+1)*sizeof(wchar_t));
 		argv_copy2[i] = argv_copy[i];
 		if (!argv_copy[i]) {
-			fprintf(stderr, "out of memory");
+			fprintf(stderr, "out of memory\n");
 			return 1;
 		}
 		count = mbstowcs(argv_copy[i], argv[i], argsize+1);
 		if (count == (size_t)-1) {
-			fprintf(stderr, "Could not convert argument %d to string", i);
+			fprintf(stderr, "Could not convert argument %d to string\n", i);
 			return 1;
 		}
 	}


More information about the Python-3000-checkins mailing list