- used 'rb' to open file as stated at docu https://docs.python.org/3/c-api/veryhigh.html of PyRun_SimpleFileEx:

    Note: On Windows, fp should be opened as binary mode (e.g. fopen(filename, "rb"). Otherwise, Python may not handle script file with LF line ending correctly.
- readded error handling for PyRun_SimpleFileEx
- added unittestfiles with mac, unix lineending and for codepage windows-1252
- still open: handling of non unicode strings represented as py byte in python3, failing e.g. in editor.getText()

Author: chcg

PythonScript/python_tests/tests/CP1252FileCase.py

@@ -0,0 +1,18 @@
+# -*- coding: windows-1252 -*-
+import unittest
+from Npp import notepad, editor
+
+class CP1252FileCase(unittest.TestCase):
+    def setUp(self):
+        notepad.new()
+
+    def tearDown(self):
+        editor.setSavePoint()
+        notepad.close()
+
+    def test_simple_text_output(self):
+        editor.write(u'test123äöü');
+        text = editor.getText()
+        self.assertEqual(text, u'test123äöü');
+
+suite = unittest.TestLoader().loadTestsFromTestCase(CP1252FileCase)

PythonScript/python_tests/tests/LineEndingMacTestCase.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-import unittestfrom Npp import notepad, editorclass LineEndingMacTestCase(unittest.TestCase):    def setUp(self):        notepad.new()    def tearDown(self):        editor.setSavePoint()        notepad.close()    def test_simple_text_output(self):        editor.write(u'test123äöü');        text = editor.getText()        self.assertEqual(text, u'test123äöü');suite = unittest.TestLoader().loadTestsFromTestCase(LineEndingMacTestCase)

PythonScript/python_tests/tests/LineEndingUnixTestCase.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+import unittest
+from Npp import notepad, editor
+
+class LineEndingUnixTestCase(unittest.TestCase):
+    def setUp(self):
+        notepad.new()
+
+    def tearDown(self):
+        editor.setSavePoint()
+        notepad.close()
+
+    def test_simple_text_output(self):
+        editor.write(u'test123äöü');
+        text = editor.getText()
+        self.assertEqual(text, u'test123äöü');
+
+suite = unittest.TestLoader().loadTestsFromTestCase(LineEndingUnixTestCase)

PythonScript/src/PythonHandler.cpp

@@ -305,14 +305,21 @@ void PythonHandler::runScriptWorker(const std::shared_ptr<RunScriptArgs>& args)
 	}
 	else
 	{
-		FILE* pyFile = _Py_wfopen(args->m_filename.c_str(), _T("r"));
-
-
-
-
+		FILE* pyFile = _Py_wfopen(args->m_filename.c_str(), _T("rb"));
 		if (pyFile)
 		{
-			PyRun_SimpleFileEx(pyFile, WcharMbcsConverter::tchar2char(args->m_filename.c_str()).get(), 1);
+			if (PyRun_SimpleFileEx(pyFile, WcharMbcsConverter::tchar2char(args->m_filename.c_str()).get(), 1) == -1)
+			{
+				if (ConfigFile::getInstance()->getSetting(_T("ADDEXTRALINETOOUTPUT")) == _T("1"))
+				{
+					mp_console->writeText(boost::python::str("\n"));
+				}
+				
+				if (ConfigFile::getInstance()->getSetting(_T("OPENCONSOLEONERROR")) == _T("1"))
+				{
+					mp_console->pythonShowDialog();
+				}
+			}
 		}
 
 	}