merged from debian-sid

3 files changed, 26 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 718d45dd..5f47b713 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,28 @@
-python-apt (0.7.100.1) UNRELEASED; urgency=low
+python-apt (0.7.100.1ubuntu1) UNRELEASEDnatty; urgency=low
 
+  * merged from debian
   * apt/progress/text.py:
     - only run ioctl for termios.TIOCGWINSZ if the fd is a tty
     
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 07 Dec 2010 13:41:07 +0100
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 21 Dec 2010 17:49:23 +0100
+
+python-apt (0.7.100.1) unstable; urgency=low
+
+  [ Julian Andres Klode ]
+  * python/generic.h: Fix a memory leak (leaking on every unicode string).
+  * debian/control: add Replaces to python-apt-common, python3-apt; to
+    avoid file conflicts with files previously in python-apt (Closes: #605136).
+
+  [ Michael Vogt ]
+  * python/generic.h:
+    - set Object to NULL in CppDeallocPtr
+  * python/depcache.cc:
+    - don't run "actiongroup.release()" if the object was already
+      deallocated
+  * tests/test_apt_cache.py:
+    - fix tests to work if apt compressed indexes are enabled
+
+ -- Julian Andres Klode <jak@debian.org>  Sun, 12 Dec 2010 14:30:33 +0100
 
 python-apt (0.7.100ubuntu2) natty; urgency=low
 
@@ -103,8 +122,6 @@ python-apt (0.7.98) unstable; urgency=low
     - do use PyString_FromFormat(), in python versions below 2.7 it
       does not support long long (%llu), use strprintf() from libapt
       instead
-  * tests/test_apt_cache.py:
-    - fix tests to work if apt compressed indexes are enabled
 
   [ Kiwinote ]
   * apt/debfile:
diff --git a/debian/control b/debian/control
index e7521c60..4b1b2d92 100644
--- a/debian/control
+++ b/debian/control
@@ -89,6 +89,7 @@ Architecture: all
 Depends: ${misc:Depends}, python | python3
 Enhances: python-apt, python3-apt
 Breaks: python-apt (<< 0.7.98+nmu1)
+Replaces: python-apt (<< 0.7.98+nmu1)
 Description: Python interface to libapt-pkg (locales)
  The apt_pkg Python interface will provide full access to the internal
  libapt-pkg structures allowing Python programs to easily perform a
@@ -122,6 +123,7 @@ Priority: extra
 Architecture: any
 Section: debug
 Breaks: python-apt (<< 0.7.98+nmu1)
+Replaces: python-apt (<< 0.7.98+nmu1)
 Depends: python3-dbg, python3-apt (= ${binary:Version}), ${shlibs:Depends},
          ${misc:Depends}
 Description: Python 3 interface to libapt-pkg (debug extension)
diff --git a/python/generic.h b/python/generic.h
index 7abf7e7a..ce9e5091 100644
--- a/python/generic.h
+++ b/python/generic.h
@@ -79,7 +79,9 @@ typedef int Py_ssize_t;
 
 static inline const char *PyUnicode_AsString(PyObject *op) {
     // Convert to bytes object, using the default encoding.
-    PyObject *bytes = PyUnicode_AsEncodedString(op,0,0);
+    // Use Python-internal API, there is no other way to do this
+    // without a memory leak.
+    PyObject *bytes = _PyUnicode_AsDefaultEncodedString(op, 0);
     return bytes ? PyBytes_AS_STRING(bytes) : 0;
 }