[Piuparts-commits] rev 690 - in trunk: . debian

[Holger Levsen]

Author: holger
Date: 2010-06-21 17:48:11 +0000 (Mon, 21 Jun 2010)
New Revision: 690

Modified:
   trunk/debian/changelog
   trunk/piuparts.py
Log:
* Use debian module when available, else debian_bundle module. (Closes:
  #586443)
* Use built-in set type, available since python-2.4

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-05-22 09:47:56 UTC (rev 689)
+++ trunk/debian/changelog	2010-06-21 17:48:11 UTC (rev 690)
@@ -53,6 +53,11 @@
     - Check for remaining logrotate files which produce output after the
       package was removed. (Closes: #566597)
 
+  [ John Wright ]
+  * Use debian module when available, else debian_bundle module. (Closes:
+    #586443)
+  * Use built-in set type, available since python-2.4
+
  -- Holger Levsen <holger at debian.org>  Sun, 24 Jan 2010 15:27:50 +0100
 
 piuparts (0.38) unstable; urgency=low

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2010-05-22 09:47:56 UTC (rev 689)
+++ trunk/piuparts.py	2010-06-21 17:48:11 UTC (rev 690)
@@ -45,13 +45,15 @@
 import stat
 import re
 import pickle
-import sets
 import subprocess
 import unittest
 import urllib
 import uuid
-from debian_bundle import deb822
 
+try:
+    from debian import deb822
+except ImportError:
+    from debian_bundle import deb822
 
 class Defaults:
 
@@ -1445,7 +1447,7 @@
 
 def offending_packages(meta_infos, file_owners):
     """Return a Set of offending packages."""
-    pkgset = sets.Set()
+    pkgset = set()
     for name, data in meta_infos:
         if name in file_owners:
             for pkg in file_owners[name]: