Throw exception for pyreplace/pymlreplace

bruderstein · bruderstein · commit f56d32fc4d87 · 2014-02-14T12:49:53.000+01:00
diff --git a/PythonScript/src/ScintillaPython.cpp b/PythonScript/src/ScintillaPython.cpp
@@ -74,6 +74,8 @@ 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.")
diff --git a/PythonScript/src/ScintillaWrapper.cpp b/PythonScript/src/ScintillaWrapper.cpp
@@ -6,6 +6,7 @@
 #include "Replacer.h"
 #include "Match.h"
 #include "ReplacementContainer.h"
+#include "NotSupportedException.h"
 #include "PythonScript/NppPythonScript.h"
 
 
@@ -30,30 +31,14 @@ ScintillaWrapper::~ScintillaWrapper()
 	// m_handle isn't allocated here. Let's just NULL out reference to it, then.
 	m_handle = NULL;
 }
-/*
-void ScintillaWrapper::addText(str s)
-{
-	const char *raw = extract<const char*>(s);
-	call(SCI_ADDTEXT, len(s), reinterpret_cast<LPARAM>(raw));
-}
 
 
-void ScintillaWrapper::AddStyledText(ScintillaCells s)
+boost::python::object deprecated_replace_function(boost::python::tuple /* args */, boost::python::dict /* kwargs */)
 {
-	call(SCI_ADDSTYLEDTEXT, s.length(), reinterpret_cast<LPARAM>(s.cells()));
+    throw NppPythonScript::NotSupportedException("The pyreplace(), pymlreplace(), pysearch() and pymlsearch() functions have been deprecated.\n"
+		"The new replace(), rereplace(), search(), and research() functions have all the same functionality, but are faster, more reliable and have better support for unicode.");
 }
 
-str ScintillaWrapper::getLine(int lineNumber)
-{
-	int resultLength = call(SCI_GETLINE, lineNumber, NULL);
-	char * result = (char *)malloc(resultLength + 1);
-	call(SCI_GETLINE, lineNumber, reinterpret_cast<LPARAM>(result));
-	result[resultLength] = '\0';
-	str o = str((const char *)result);
-	free(result);
-	return o;
-}
-*/
 void ScintillaWrapper::notify(SCNotification *notifyCode)
 {
 	if (!m_notificationsEnabled)
diff --git a/PythonScript/src/ScintillaWrapper.h b/PythonScript/src/ScintillaWrapper.h
@@ -43,6 +43,10 @@ struct CallbackExecArgs
 	boost::python::dict params;
 };
 
+
+// Function that throws a notsupported exception, with the message about the method being deprecated
+boost::python::object deprecated_replace_function(boost::python::tuple args, boost::python::dict kwargs);
+
 class ScintillaWrapper : public NppPythonScript::PyProducerConsumer<CallbackExecArgs>
 {
 public:
