- fixed string length in extractEncodedString()

- removed commented deprecated code: pyreplace, pymlreplace, pysearch, pymlsearch
- adapted further unittest cases
- adpated code indentation

Author: chcg

PythonScript/python_tests/tests/ConsoleTestCase.py

@@ -13,7 +13,7 @@ def test_print_utf8_to_console(self):
         console.clear()
         console.write(u'\u00C4pfel')
         text = console.editor.getText()
-        self.assertEqual(text, u'\u00C4pfel'.encode('utf-8'))
+        self.assertEqual(text, u'\u00C4pfel')
         console.clear()
 
 

PythonScript/python_tests/tests/NotepadWrapperTestCase.py

@@ -37,15 +37,17 @@ def tearDown(self):
     def normalise_filename(self, filename):
         buf = ctypes.create_unicode_buffer(260)
         GetLongPathName = ctypes.windll.kernel32.GetLongPathNameW
-        GetLongPathName(filename.decode('windows-1252'), buf, 260)
+        # TODO: replaced filename.decode('windows-1252') by just filename,
+        # TODO: what is ok on win10, might be a problem on older windows versions 
+        GetLongPathName(filename, buf, 260)
         return buf.value.lower()
 
 
     def check_file_contents(self, filename, expectedContents):
         f = open(filename, "rb")
         actualContents = f.read()
         f.close()
-        self.assertEqual(actualContents, expectedContents)
+        self.assertEqual(actualContents.decode('utf-8'), expectedContents)
 
 
     def get_temp_filename(self):
@@ -1268,11 +1270,13 @@ def test_saveFile(self):
         self.assertEqual(_content, '')
 
         notepad.saveFile(tmpfile)
+        # TODO moved here from below, because otherwise with N++ 7.8.6 the _content is still empty
+        # TODO on reading below from python/filesystem, seems to be a N++ issue, which needs further investigation
+        notepad.close()
         with open(tmpfile, 'r') as f:
             _content = f.read()
 
         self.assertEqual(_content, text_to_be_saved)
-        notepad.close()
 
 
     def test_setEditorBorderEdge(self):

PythonScript/python_tests/tests/ScintillaWrapperTestCase.py

@@ -839,6 +839,7 @@ def test_scintillawrapper_void_void_string_in_callback_lexerLanguage(self):
         self.assertEqual(self.callbackCalled, True)
 
     def test_scintillawrapper_void_void_string(self):
+        editor.setWordChars('dummy_input')
         originalWordChars = editor.getWordChars()
         editor.setWordChars('abcdefghijklmnop')
         changedWordChars = editor.getWordChars()

PythonScript/src/NotepadPlusWrapper.cpp

@@ -435,7 +435,7 @@ idx_t NotepadPlusWrapper::getCurrentDocIndex(int view)
 void NotepadPlusWrapper::setStatusBar(StatusBarSection section, const char *text)
 {
 #ifdef UNICODE
-		std::shared_ptr<TCHAR> s = WcharMbcsConverter::char2tchar(text);
+	std::shared_ptr<TCHAR> s = WcharMbcsConverter::char2tchar(text);
 	callNotepad(NPPM_SETSTATUSBAR, static_cast<WPARAM>(section), reinterpret_cast<LPARAM>(s.get()));
 #else
 	callNotepad(NPPM_SETSTATUSBAR, static_cast<WPARAM>(section), reinterpret_cast<LPARAM>(text));
@@ -471,7 +471,7 @@ void NotepadPlusWrapper::activateFileString(boost::python::str filename)
 {
 	notAllowedInScintillaCallback("activateFile() cannot be called in a synchronous editor callback. "
 		"Use an asynchronous callback, or avoid using activateFile() in the callback handler");
-	#ifdef UNICODE
+#ifdef UNICODE
 	std::shared_ptr<TCHAR> s = WcharMbcsConverter::char2tchar((const char*)boost::python::extract<const char*>(filename));
 	callNotepad(NPPM_SWITCHTOFILE, 0, reinterpret_cast<LPARAM>(s.get()));
 #else

PythonScript/src/ScintillaPython.cpp

@@ -89,8 +89,6 @@ BOOST_PYTHON_MODULE(Npp)
 																										  "   def myIncrement(m):\n"
 																										  "       return int(m.group(1)) + 1\n\n"
 																										  "And call rereplace('([0-9]+)', myIncrement) and it will increment all the integers.")
-        .def("pyreplace", boost::python::raw_function(&deprecated_replace_function), "Deprecated in this version of PythonScript for Notepad++. Use the new rereplace() instead")
-        .def("pymlreplace", boost::python::raw_function(&deprecated_replace_function), "Deprecated in this version of PythonScript for Notepad++. Use the new rereplace() instead")
 		.def("getWord", &ScintillaWrapper::getWord, "getWord([position[, useOnlyWordChars]])\nGets the word at position.  If position is not given or None, the current caret position is used.\nuseOnlyWordChars is a bool that is passed to Scintilla - see Scintilla rules on what is match. If not given or None, it is assumed to be true.")
 		.def("getWord", &ScintillaWrapper::getWordNoFlags, "getWord([position[, useOnlyWordChars]])\nGets the word at position.  If position is not given or None, the current caret position is used.\nuseOnlyWordChars is a bool that is passed to Scintilla - see Scintilla rules on what is match. If not given or None, it is assumed to be true.")
 		.def("getWord", &ScintillaWrapper::getCurrentWord, "getWord([position[, useOnlyWordChars]])\nGets the word at position.  If position is not given or None, the current caret position is used.\nuseOnlyWordChars is a bool that is passed to Scintilla - see Scintilla rules on what is match. If not given or None, it is assumed to be true.")