Merge lp:~mvo/python-apt/mvo into lp:~mvo/python-apt/debian-sid-mirror

[Michael Vogt]

This adds the "codename" to the PackageFile object.

[lp:~mvo/python-apt/mvo]

612. By Michael Vogt on 2012-10-12

add dep8 style tests

613. By Michael Vogt on 2012-10-12

debian/tests/control: update depends line

614. By Michael Vogt on 2012-10-15

merge from the debian-sid branch

615. By Michael Vogt on 2012-10-15

update changelog

616. By Michael Vogt on 2012-10-15

merged lp:~jconti/python-apt/closeable-cache

617. By Michael Vogt on 2012-10-15

add changelog for lp:~jconti/python-apt/closeable-cache and add new test "test_cache_close_download_fails"

618. By Michael Vogt on 2012-10-15

close cache on (re)open

619. By Michael Vogt on 2012-10-15

apt/cache.py: add comment

620. By Michael Vogt on 2012-10-17

tests/test_apt_cache.py: delete test_cache_delete_leasks_fds() as its not reliable

621. By Michael Vogt on 2012-10-23

build fixes for python3.3

622. By Michael Vogt on 2013-03-09

fix documentation for version_compare(), thanks to
Ansgar Burchardt, closes: #680891

Unmerged revisions

622. By Michael Vogt on 2013-03-09

fix documentation for version_compare(), thanks to
Ansgar Burchardt, closes: #680891

=== modified file 'apt/auth.py'
--- apt/auth.py	2012-10-10 14:05:28 +0000
+++ apt/auth.py	2013-03-09 19:55:24 +0000
@@ -78,7 +78,8 @@
                                 stderr=subprocess.PIPE)
 
         content = kwargs.get("stdin", None)
-        if isinstance(content, unicode):
+        # py2 needs this encoded, py3.3 will crash if it is
+        if isinstance(content, unicode) and sys.version_info[:2] < (3, 3):
             content = content.encode("utf-8")
 
         output, stderr = proc.communicate(content)

=== modified file 'apt/cache.py'
--- apt/cache.py	2012-04-17 19:17:10 +0000
+++ apt/cache.py	2013-03-09 19:55:24 +0000
@@ -42,6 +42,9 @@
 class LockFailedException(IOError):
     """Exception that is thrown when locking fails."""
 
+class CacheClosedException(Exception):
+    """Exception that is thrown when the cache is used after close()."""
+
 
 class Cache(object):
     """Dictionary-like package cache.
@@ -139,6 +142,8 @@
         """
         if progress is None:
             progress = apt.progress.base.OpProgress()
+        # close old cache on (re)open
+        self.close()
         self.op_progress = progress
         self._run_callbacks("cache_pre_open")
 
@@ -172,6 +177,20 @@
         progress.done()
         self._run_callbacks("cache_post_open")
 
+    def close(self):
+        """ Close the package cache """
+        # explicitely free the FDs that _records has open
+        del self._records
+        self._records = None
+
+    def __enter__(self):
+        """ Enter the with statement """
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        """ Exit the with statement """
+        self.close()
+
     def __getitem__(self, key):
         """ look like a dictionary (get key) """
         try:
@@ -238,6 +257,8 @@
     @property
     def required_download(self):
         """Get the size of the packages that are required to download."""
+        if self._records is None:
+            raise CacheClosedException("Cache object used after close() called")
         pm = apt_pkg.PackageManager(self._depcache)
         fetcher = apt_pkg.Acquire()
         pm.get_archives(fetcher, self._list, self._records)
@@ -288,6 +309,8 @@
 
     def _fetch_archives(self, fetcher, pm):
         """ fetch the needed archives """
+        if self._records is None:
+            raise CacheClosedException("Cache object used after close() called")
 
         # get lock
         lockfile = apt_pkg.config.find_dir("Dir::Cache::Archives") + "lock"

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-15 13:30:14 +0000
+++ debian/changelog	2013-03-09 19:55:24 +0000
@@ -1,13 +1,29 @@
 python-apt (0.8.8.1) unstable; urgency=low
 
+  [ Michael Vogt ]
   * python/tag.cc:
     - make TagSecString_FromStringAndSize, TagSecString_FromString
       static, thanks to jcristau
+<<<<<<< TREE
   * tests/test_lp659438.py:
     - fix missing architecture to make the tests pass again during
       build with the latest apt
 
  -- Michael Vogt <[e-mail]>  Thu, 15 Nov 2012 09:55:24 +0100
+=======
+  * python/cache.cc:
+    - add "Codename" to PackageFile object
+  * add dep8 style autopkgtest support
+  * build fixes for python3.3
+  * fix documentation for version_compare(), thanks to
+    Ansgar Burchardt, closes: #680891
+
+  [ Jason Conti ]
+  * lp:~jconti/python-apt/closeable-cache:
+    - add apt.Cache.close() method
+
+ -- Michael Vogt <[e-mail]>  Mon, 15 Oct 2012 10:03:21 +0200
+>>>>>>> MERGE-SOURCE
 
 python-apt (0.8.8) unstable; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2012-10-12 08:08:21 +0000
+++ debian/control	2013-03-09 19:55:24 +0000
@@ -21,6 +21,7 @@
 	       python-unittest2
 Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid
 Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes
+XS-Testsuite: autopkgtest
 
 Package: python-apt
 Architecture: any

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2013-03-09 19:55:24 +0000
@@ -0,0 +1,2 @@
+Tests: run-tests
+Depends: @, apt-utils, python-debian, fakeroot, intltool

=== added file 'debian/tests/run-tests'
--- debian/tests/run-tests	1970-01-01 00:00:00 +0000
+++ debian/tests/run-tests	2013-03-09 19:55:24 +0000
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+# from debian/rules
+for python in $(utils/pyversions -r); do 
+    $python tests/test_all.py -q
+done

=== modified file 'python/apt_pkgmodule.cc'
--- python/apt_pkgmodule.cc	2012-03-05 12:05:39 +0000
+++ python/apt_pkgmodule.cc	2013-03-09 19:55:24 +0000
@@ -68,8 +68,8 @@
 // These are kind of legacy..
 static char *doc_VersionCompare =
     "version_compare(a: str, b: str) -> int\n\n"
-    "Compare the given versions; return -1 if 'a' is smaller than 'b',\n"
-    "0 if they are equal, and 2 if 'a' is larger than 'b'.";
+    "Compare the given versions; return <0 if 'a' is smaller than 'b',\n"
+    "0 if they are equal, and >0 if 'a' is larger than 'b'.";
 static PyObject *VersionCompare(PyObject *Self,PyObject *Args)
 {
    char *A;

=== modified file 'python/cache.cc'
--- python/cache.cc	2012-10-01 08:10:49 +0000
+++ python/cache.cc	2013-03-09 19:55:24 +0000
@@ -1247,6 +1247,12 @@
     return Safe_FromString(File.Architecture());
 }
 
+static PyObject *PackageFile_GetCodename(PyObject *Self,void*)
+{
+    pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
+    return Safe_FromString(File.Codename());
+}
+
 static PyObject *PackageFile_GetSite(PyObject *Self,void*)
 {
     pkgCache::PkgFileIterator &File = GetCpp<pkgCache::PkgFileIterator>(Self);
@@ -1305,6 +1311,8 @@
    "The archive of the package file (i.e. 'Suite' in the Release file)."},
   {"component",PackageFile_GetComponent,0,
    "The component of this package file (e.g. 'main')."},
+  {"codename",PackageFile_GetCodename,0,
+   "The codename of this package file (e.g. squeeze-updates)."},
   {"filename",PackageFile_GetFileName,0,
    "The path to the file."},
   {"id",PackageFile_GetID,0,

=== modified file 'python/generic.h'
--- python/generic.h	2011-08-01 07:29:25 +0000
+++ python/generic.h	2013-03-09 19:55:24 +0000
@@ -80,10 +80,14 @@
 
 static inline const char *PyUnicode_AsString(PyObject *op) {
     // Convert to bytes object, using the default encoding.
+#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 3
+    return PyUnicode_AsUTF8(op);
+#else
     // 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;
+#endif
 }
 
 // Convert any type of string based object to a const char.

=== modified file 'tests/test_apt_cache.py'
--- tests/test_apt_cache.py	2011-12-09 08:16:08 +0000
+++ tests/test_apt_cache.py	2013-03-09 19:55:24 +0000
@@ -7,19 +7,27 @@
 # are permitted in any medium without royalty provided the copyright
 # notice and this notice are preserved.
 """Unit tests for verifying the correctness of check_dep, etc in apt_pkg."""
+
+import glob
+import logging
 import os
+import shutil
+import sys
 import tempfile
 import unittest
 
+if sys.version_info[0] == 2 and sys.version_info[1] == 6:
+    from unittest2 import TestCase
+else:
+    from unittest import TestCase
+
+
 from test_all import get_library_dir
-import sys
 sys.path.insert(0, get_library_dir())
 
 import apt
 import apt_pkg
-import shutil
-import glob
-import logging
+
 
 def if_sources_list_is_readable(f):
     def wrapper(*args, **kwargs):
@@ -29,7 +37,17 @@
             logging.warn("skipping '%s' because sources.list is not readable" % f)
     return wrapper
 
-class TestAptCache(unittest.TestCase):
+
+def get_open_file_descriptors():
+    try:
+        fds = os.listdir("/proc/self/fd")
+    except OSError:
+        logging.warn("failed to list /proc/self/fd")
+        return set([])
+    return set(map(int, fds))
+
+
+class TestAptCache(TestCase):
     """ test the apt cache """
 
     def setUp(self):
@@ -68,7 +86,34 @@
                 self.assertEqual(r['Package'], pkg.shortname)
                 self.assertTrue('Version' in r)
                 self.assertTrue(len(r['Description']) > 0)
-                self.assertTrue(str(r).startswith('Package: %s\n' % pkg.shortname))
+                self.assertTrue(
+                    str(r).startswith('Package: %s\n' % pkg.shortname))
+
+    @if_sources_list_is_readable
+    def test_cache_close_leak_fd(self):
+        fds_before_open = get_open_file_descriptors()
+        cache = apt.Cache()
+        opened_fd = get_open_file_descriptors().difference(fds_before_open)
+        cache.close()
+        fds_after_close = get_open_file_descriptors()
+        unclosed_fd = opened_fd.intersection(fds_after_close)
+        self.assertEqual(fds_before_open, fds_after_close)
+        self.assertEqual(unclosed_fd, set())
+
+    def test_cache_open_twice_leaks_fds(self):
+        cache = apt.Cache()
+        fds_before_open = get_open_file_descriptors()
+        cache.open()
+        fds_after_open_twice = get_open_file_descriptors()
+        self.assertEqual(fds_before_open, fds_after_open_twice)
+
+    @if_sources_list_is_readable
+    def test_cache_close_download_fails(self):
+        cache = apt.Cache()
+        self.assertEqual(cache.required_download, 0)
+        cache.close()
+        with self.assertRaises(apt.cache.CacheClosedException):
+            cache.required_download
 
     def test_get_provided_packages(self):
         apt.apt_pkg.config.set("Apt::architecture", "i386")