[Python-checkins] r43024 - in python/branches/release24-maint: Lib/test/test_cmd_line.py Modules/main.c

[neal.norwitz]

Author: neal.norwitz
Date: Tue Mar 14 07:47:07 2006
New Revision: 43024

Modified:
   python/branches/release24-maint/Lib/test/test_cmd_line.py
   python/branches/release24-maint/Modules/main.c
Log:
Backport 42932:

Try to be a bit more consistent on all platforms:
 python .
 python < .

both print a message, return non-zero and do not core dump.
This hopefully fixes the failure on Solaris.



Modified: python/branches/release24-maint/Lib/test/test_cmd_line.py
==============================================================================
--- python/branches/release24-maint/Lib/test/test_cmd_line.py	(original)
+++ python/branches/release24-maint/Lib/test/test_cmd_line.py	Tue Mar 14 07:47:07 2006
@@ -16,14 +16,8 @@
         return subprocess.call([sys.executable, cmd_line], stderr=subprocess.PIPE)
 
     def test_directories(self):
-         if sys.platform == 'win32':
-             # Exit code for "python .", Error 13: permission denied = 2
-             expected_exit_code = 2
-         else:
-             # Linux has no problem with "python .", Exit code = 0
-             expected_exit_code = 0
-         self.assertEqual(self.exit_code('.'), expected_exit_code)
-         self.assertTrue(self.exit_code('< .') != 0)
+        self.assertNotEqual(self.exit_code('.'), 0)
+        self.assertNotEqual(self.exit_code('< .'), 0)
 
     def verify_valid_flag(self, cmd_line):
         data = self.start_python(cmd_line)

Modified: python/branches/release24-maint/Modules/main.c
==============================================================================
--- python/branches/release24-maint/Modules/main.c	(original)
+++ python/branches/release24-maint/Modules/main.c	Tue Mar 14 07:47:07 2006
@@ -364,7 +364,8 @@
 				struct stat sb;
 				if (fstat(fileno(fp), &sb) == 0 &&
 				    S_ISDIR(sb.st_mode)) {
-					fprintf(stderr, "%s: warning '%s' is a directory\n", argv[0], filename);
+					fprintf(stderr, "%s: '%s' is a directory, cannot continue\n", argv[0], filename);
+					return 1;
 				}
 			}
 		}