From: Neal Norwitz <nnorwitz@gmail.com>
Date: Tue, 14 Mar 2006 06:47:07 +0000 (+0000)
Subject: Backport 42932:
X-Git-Tag: v2.4.3c1~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a2bffc2351fb867dacbe1646a219a8151166642;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index 20e4afa6f784..a4a656d451bd 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -16,14 +16,8 @@ class CmdLineTest(unittest.TestCase):
         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)
diff --git a/Modules/main.c b/Modules/main.c
index d511e59763d8..f4f0bf637932 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -364,7 +364,8 @@ Py_Main(int argc, char **argv)
 				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;
 				}
 			}
 		}