Added KeyValues.load_from_buffer/buffer2 (issue #379)

Author: Ayuto

src/core/modules/keyvalues/keyvalues.h

@@ -111,6 +111,7 @@ class KeyValuesExt
 		KeyValues* pKeyValues = new KeyValues("");
 		if (!pKeyValues->LoadFromFile(filesystem, szFile)) {
 			pKeyValues->deleteThis();
+			BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Failed to load from file.")
 			return NULL;
 		}
 		return boost::shared_ptr<KeyValues>(pKeyValues, &__del__);
@@ -121,6 +122,22 @@ class KeyValuesExt
 		return pKeyValues->LoadFromFile(filesystem, szFile);
 	}
 
+	static boost::shared_ptr<KeyValues> LoadFromBuffer(const char * buffer)
+	{ 
+		KeyValues* pKeyValues = new KeyValues("");
+		if (!pKeyValues->LoadFromBuffer("", buffer, filesystem)) {
+			pKeyValues->deleteThis();
+			BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Failed to load from buffer.")
+			return NULL;
+		}
+		return boost::shared_ptr<KeyValues>(pKeyValues, &__del__);
+	}
+	
+	static bool LoadFromBuffer2(KeyValues* pKeyValues, const char * buffer)
+	{ 
+		return pKeyValues->LoadFromBuffer("", buffer, filesystem);
+	}
+
 	static bool SaveToFile(KeyValues* pKeyValues, const char * szFile)
 	{ return pKeyValues->SaveToFile(filesystem, szFile); }
 

src/core/modules/keyvalues/keyvalues_wrap.cpp

@@ -130,6 +130,18 @@ void export_keyvalues(scope _keyvalues)
 			(arg("file_name"))
 		)
 
+		.def("load_from_buffer",
+			&KeyValuesExt::LoadFromBuffer,
+			"Load KeyValues data from a buffer and return a new KeyValues instance on success.",
+			(arg("buffer"))
+		).staticmethod("load_from_buffer")
+
+		.def("load_from_buffer2",
+			&KeyValuesExt::LoadFromBuffer2,
+			"Load KeyValues data from a buffer into an existing KeyValues instance.",
+			(arg("buffer"))
+		)
+
 		.def("save_to_file",
 			&KeyValuesExt::SaveToFile,
 			(arg("file_name")),