start to fix python unittests

- corrected importlib issue (https://docs.python.org/3/library/importlib.html)
- removed deprecated e.message (https://stackoverflow.com/questions/1272138/baseexception-message-deprecated-in-python-2-6)
- use __str__ to get the unicode string, no encode needed with python3
- workaround how to check if GIL is holden
- need to check init sequence, just first tests

Author: chcg

PythonScript/python_tests/RunTests.py

@@ -2,6 +2,7 @@
 import sys
 import unittest
 import os
+import importlib
 
 # unittest module expects argv to be set
 sys.argv = ['']
@@ -13,10 +14,10 @@
 for test_name in  os.listdir(os.path.join(path, 'tests')):
     (test_name, ext) = os.path.splitext(test_name)
     if ext == '.py':
-        test_module = reload(__import__('npp_unit_tests.tests.' + test_name))
+        test_module = importlib.reload(__import__('npp_unit_tests.tests.' + test_name))
         test_suite = getattr(test_module.tests, test_name)
         if test_suite:
-            reload(test_suite)
+            importlib.reload(test_suite)
         if hasattr(test_suite, 'suite'):
             test_suites.append(test_suite.suite)
 

PythonScript/python_tests/tests/NotepadWrapperTestCase.py

@@ -87,12 +87,12 @@ def _invalid_parameter_passed(self, method, *args):
         try:
             method(*args)
         except Exception as e:
-            if 'did not match C++ signature' in e.message:
+            if 'did not match C++ signature' in str(e):
                 raise ArgumentError
-            elif 'invalid aka unknown bufferID provided' in e.message:
+            elif 'invalid aka unknown bufferID provided' in str(e):
                 raise ArgumentError
             else:
-                raise Exception('args:{}  -  message:{}'.format(args, e.message))
+                raise Exception('args:{}  -  message:{}'.format(args, str(e)))
 
 
     def __test_invalid_parameter_passed(self, notepad_method):

PythonScript/src/GILManager.h

@@ -38,9 +38,9 @@ namespace NppPythonScript
 	protected:
 		static bool doIHaveTheGIL()
 		{
-
+			//TODO check if PyThreadState_GET should be used or something else
             PyThreadState* thisThreadState = PyGILState_GetThisThreadState();
-            return (thisThreadState && thisThreadState == PyThreadState_GET());
+            return (thisThreadState && thisThreadState == _PyThreadState_UncheckedGet());
 		}
 
 	};

PythonScript/src/PythonConsole.cpp

@@ -193,10 +193,10 @@ void PythonConsole::writeText(boost::python::object text)
 	{
         if (PyUnicode_Check(text.ptr()))
 		{
-			boost::python::object utf8String(boost::python::handle<PyObject>(PyUnicode_AsUTF8String(text.ptr())));
-            
-            std::string textToWrite((const char *)boost::python::extract<const char *>(utf8String), _len(utf8String));
-            GILRelease release; 
+
+
+            std::string textToWrite((const char *)boost::python::extract<const char *>(text.attr("__str__")()));
+            GILRelease release;
 			if (m_runStatementExecuted)
 			{
 				mp_consoleDlg->writeColoredText(textToWrite.size(), textToWrite.c_str());
@@ -229,9 +229,9 @@ void PythonConsole::writeError(boost::python::object text)
 	{
 		if (PyUnicode_Check(text.ptr()))
 		{
-            boost::python::object utf8String(boost::python::handle<PyObject>(PyUnicode_AsUTF8String(text.ptr())));
-            
-            std::string textToWrite((const char *)boost::python::extract<const char *>(utf8String));
+
+
+            std::string textToWrite((const char *)boost::python::extract<const char *>(text.attr("__str__")()));
             GILRelease release;
             mp_consoleDlg->writeError(textToWrite.size(), textToWrite.c_str());
 		}
@@ -302,8 +302,8 @@ void PythonConsole::consume(std::shared_ptr<std::string> statement)
 		{
 			boost::python::object oldStdout = m_sys.attr("stdout");
 			m_sys.attr("stdout") = boost::python::ptr(this);
-			PyObject* unicodeCommand = PyUnicode_FromEncodedObject(boost::python::str(statement->c_str()).ptr(), "utf-8", NULL);
-			boost::python::object result = m_pushFunc(boost::python::handle<PyObject>(unicodeCommand));
+
+			boost::python::object result = m_pushFunc(boost::python::str(statement->c_str()));
 			//Py_DECREF(unicodeCommand);
 			m_sys.attr("stdout") = oldStdout;
 

PythonScript/src/PythonHandler.cpp

@@ -92,6 +92,8 @@ void PythonHandler::initPython()
 	// Don't import site - if Python 2.7 doesn't find it as part of Py_Initialize,
 	// it does an exit(1) - AGH!
 	Py_NoSiteFlag = 1;
+	Py_IgnoreEnvironmentFlag = 1;
+	Py_NoUserSiteDirectory = 1;
 
 	Py_Initialize();
     // Initialise threading and create & acquire Global Interpreter Lock

PythonScript/src/ScintillaWrapper.cpp

@@ -55,8 +55,8 @@ std::string ScintillaWrapper::getStringFromObject(boost::python::object o)
     std::string raw;
     if (PyUnicode_Check(o.ptr()))
 	{
-        boost::python::object utf8Text = o.attr("encode")("utf-8");
-        raw = std::string(boost::python::extract<const char *>(utf8Text), _len(utf8Text));
+        boost::python::object utf8Text = o.attr("__str__")();
+        raw = std::string(boost::python::extract<const char *>(utf8Text));
 	} 
 	else
 	{
@@ -666,7 +666,9 @@ std::string ScintillaWrapper::extractEncodedString(boost::python::object str, in
             codePageName = getCurrentAnsiCodePageName();
 		}
 
-        boost::python::object searchUtf8(str.attr("encode")(codePageName));
+        //TODO how to get str.attr("encode")(codePageName) working again here
+        //currently this is always unicode (utf16 or utf8??), the internal representation of python3
+        boost::python::object searchUtf8(str.attr("__str__")());
         searchLength = boost::python::extract<int>(searchUtf8.attr("__len__")());
         resultStr.append(boost::python::extract<const char*>(searchUtf8), searchLength);
 	}