From 1c878fca17aaa7d8300224e1aed0f13066fe3e84 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 22 Feb 2007 17:11:51 +0100
Subject: * apt/package.py:   - handle invalid unicode more gracefully
 (LP#86215) * rebuild against latest apt

---
 python/string.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'python')

diff --git a/python/string.cc b/python/string.cc
index 16adc8cd..d0926da5 100644
--- a/python/string.cc
+++ b/python/string.cc
@@ -53,9 +53,11 @@ PyObject *StrSizeToStr(PyObject *Self,PyObject *Args)
    if (PyArg_ParseTuple(Args,"O",&Obj) == 0)
       return 0;
    if (PyInt_Check(Obj))
-      return CppPyString(SizeToStr(PyInt_AS_LONG(Obj)));
+      return CppPyString(SizeToStr(PyInt_AsLong(Obj)));
+   if (PyLong_Check(Obj))
+      return CppPyString(SizeToStr(PyLong_AsLong(Obj)));
    if (PyFloat_Check(Obj))
-      return CppPyString(SizeToStr(PyFloat_AS_DOUBLE(Obj)));
+      return CppPyString(SizeToStr(PyFloat_AsDouble(Obj)));
    
    PyErr_SetString(PyExc_TypeError,"Only understand integers and floats");
    return 0;
-- 
cgit v1.2.3