From f441b008883170d6a8c4cfeb814b0c07a27e6afd Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Tue, 12 Apr 2011 11:38:25 +0200
Subject: apt_pkg: Fix unsigned/long-vs-int issues (LP: #610820)

This fix is large, but simple in concept. Instead of relying
on Py_BuildValue and type signatures, or type-specific
conversion functions, create a new set of overloaded
MkPyNumber() functions that automatically do the right
thing for each numerical type.
---
 python/tarfile.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'python/tarfile.cc')

diff --git a/python/tarfile.cc b/python/tarfile.cc
index 215d3a8c..cdfe0a7c 100644
--- a/python/tarfile.cc
+++ b/python/tarfile.cc
@@ -189,35 +189,35 @@ static PyObject *tarmember_get_linkname(PyObject *self, void *closure)
 
 static PyObject *tarmember_get_mode(PyObject *self, void *closure)
 {
-    return Py_BuildValue("k", GetCpp<pkgDirStream::Item>(self).Mode);
+    return MkPyNumber(GetCpp<pkgDirStream::Item>(self).Mode);
 }
 
 static PyObject *tarmember_get_uid(PyObject *self, void *closure)
 {
-    return Py_BuildValue("k", GetCpp<pkgDirStream::Item>(self).UID);
+    return MkPyNumber(GetCpp<pkgDirStream::Item>(self).UID);
 }
 static PyObject *tarmember_get_gid(PyObject *self, void *closure)
 {
-    return Py_BuildValue("k", GetCpp<pkgDirStream::Item>(self).GID);
+    return MkPyNumber(GetCpp<pkgDirStream::Item>(self).GID);
 }
 static PyObject *tarmember_get_size(PyObject *self, void *closure)
 {
-    return Py_BuildValue("k", GetCpp<pkgDirStream::Item>(self).Size);
+    return MkPyNumber(GetCpp<pkgDirStream::Item>(self).Size);
 }
 
 static PyObject *tarmember_get_mtime(PyObject *self, void *closure)
 {
-    return Py_BuildValue("k", GetCpp<pkgDirStream::Item>(self).MTime);
+    return MkPyNumber(GetCpp<pkgDirStream::Item>(self).MTime);
 }
 
 static PyObject *tarmember_get_major(PyObject *self, void *closure)
 {
-    return Py_BuildValue("k", GetCpp<pkgDirStream::Item>(self).Major);
+    return MkPyNumber(GetCpp<pkgDirStream::Item>(self).Major);
 }
 
 static PyObject *tarmember_get_minor(PyObject *self, void *closure)
 {
-    return Py_BuildValue("k", GetCpp<pkgDirStream::Item>(self).Minor);
+    return MkPyNumber(GetCpp<pkgDirStream::Item>(self).Minor);
 }
 
 static PyObject *tarmember_repr(PyObject *self)
-- 
cgit v1.2.3