From ef9c8e692fd184824d29cba42c26daa9b20bdfdb Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 29 Nov 2007 12:07:01 +0100
Subject: * python/tag.cc   - support "None" as default in    
 ParseSection(control).get(field, default), LP: #44470

---
 python/tag.cc | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'python')

diff --git a/python/tag.cc b/python/tag.cc
index d0d862c9..4b378a55 100644
--- a/python/tag.cc
+++ b/python/tag.cc
@@ -78,7 +78,7 @@ static PyObject *TagSecFind(PyObject *Self,PyObject *Args)
 {
    char *Name = 0;
    char *Default = 0;
-   if (PyArg_ParseTuple(Args,"s|s",&Name,&Default) == 0)
+   if (PyArg_ParseTuple(Args,"s|z",&Name,&Default) == 0)
       return 0;
    
    const char *Start;
@@ -86,10 +86,7 @@ static PyObject *TagSecFind(PyObject *Self,PyObject *Args)
    if (GetCpp<pkgTagSection>(Self).Find(Name,Start,Stop) == false)
    {
       if (Default == 0)
-      {
-	 Py_INCREF(Py_None);
-	 return Py_None;
-      }
+	 Py_RETURN_NONE;
       return PyString_FromString(Default);
    }
    return PyString_FromStringAndSize(Start,Stop-Start);
-- 
cgit v1.2.3