Adding upstream version 2.7.6.upstream/2.7.6

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 122 insertions, 0 deletions

diff --git a/python/generic.cc b/python/generic.cc
new file mode 100644
index 0000000..16f1cce
--- /dev/null
+++ b/python/generic.cc
@@ -0,0 +1,122 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/
+// $Id: generic.cc,v 1.1.1.1 2001/02/20 06:32:01 jgg Exp $
+/* ######################################################################
+
+   generic - Some handy functions to make integration a tad simpler
+
+   ##################################################################### */
+									/*}}}*/
+// Include Files							/*{{{*/
+#include "generic.h"
+using namespace std;
+
+
+#include <apt-pkg/error.h>
+									/*}}}*/
+
+// HandleErrors - This moves errors from _error to Python Exceptions	/*{{{*/
+// ---------------------------------------------------------------------
+/* We throw away all warnings and only propogate the first error. */
+PyObject *HandleErrors(PyObject *Res)
+{
+   string Err;
+   int errcnt = 0;
+   int wrncnt = 0;
+   while (_error->empty() == false)
+   {
+      string Msg;
+      bool Type = _error->PopMessage(Msg);
+      if (errcnt > 0 || wrncnt > 0)
+         Err.append(", ");
+      Err.append((Type == true ? "E:" : "W:"));
+      Err.append(Msg);
+      if (Type)
+          ++errcnt;
+      else
+          ++wrncnt;
+   }
+   if (errcnt > 0)
+   {
+       PyErr_SetString(PyAptError,Err.c_str());
+       goto err;
+   }
+   else if (wrncnt > 0)
+   {
+       if (PyErr_WarnEx(PyAptWarning, Err.c_str(), 1) == -1)
+           goto err;
+   }
+
+   return Res;
+err:
+   if (Res != 0)
+      Py_DECREF(Res);
+
+    return nullptr;
+}
+
+									/*}}}*/
+// ListToCharChar - Convert a list to an array of char char		/*{{{*/
+// ---------------------------------------------------------------------
+/* Caller must free the result. 0 on error. */
+const char **ListToCharChar(PyObject *List,bool NullTerm)
+{
+   // Convert the argument list into a char **
+   int Length = PySequence_Length(List);
+   const char **Res = new const char *[Length + (NullTerm == true?1:0)];
+   for (int I = 0; I != Length; I++)
+   {
+      PyObject *Itm = PySequence_GetItem(List,I);
+      Res[I] = PyObject_AsString(Itm);
+      if (Res[I] == nullptr) {
+         delete [] Res;
+         return nullptr;
+      }
+   }
+   if (NullTerm == true)
+      Res[Length] = 0;
+   return Res;
+}
+									/*}}}*/
+// CharCharToList - Inverse of the above				/*{{{*/
+// ---------------------------------------------------------------------
+/* Zero size indicates the list is Null terminated. */
+PyObject *CharCharToList(const char **List,unsigned long Size)
+{
+   if (Size == 0)
+   {
+      for (const char **I = List; *I != 0; I++)
+	 Size++;
+   }
+
+   // Convert the whole configuration space into a list
+   PyObject *PList = PyList_New(Size);
+   for (unsigned long I = 0; I != Size; I++, List++)
+      PyList_SetItem(PList,I,CppPyString(*List));
+
+   return PList;
+}
+									/*}}}*/
+
+int PyApt_Filename::init(PyObject *object)
+{
+   this->object = NULL;
+   this->path = NULL;
+
+#if PY_MAJOR_VERSION < 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION < 2)
+   this->path = PyObject_AsString(object);
+   return this->path ? 1 : 0;
+#else
+   if (PyUnicode_Check(object)) {
+      object = PyUnicode_EncodeFSDefault(object);
+   } else if (PyBytes_Check(object)) {
+      Py_INCREF(object);
+   } else {
+      return 0;
+   }
+
+   this->object = object;
+   this->path = PyBytes_AS_STRING(this->object);
+   return 1;
+#endif
+}