Merge lp:~jelmer/bzr-builddeb/apt-deprecated into lp:bzr-builddeb

[Jelmer Vernooij]

Another (and hopefully the last) branch to cope with some renames in the apt API. Previously we would could the right API functions but we would still obtain a reference to the functions by their older names, which triggers a deprecation warning on newer versions of python-apt.

This changes the code to only attempt to get a reference to the older name if the newer name is not available.

[Robert Collins (lifeless)]

Can I suggest a helper function?

[Jelmer Vernooij (jelmer)]

see updated

[lp:~jelmer/bzr-builddeb/apt-deprecated]

453. By Jelmer Vernooij on 2010-05-24

Use helper function.

[Robert Collins (lifeless)]

Much nicer, I think.

=== modified file 'upstream.py'
--- upstream.py	2010-04-22 10:54:52 +0000
+++ upstream.py	2010-05-24 01:50:40 +0000
@@ -111,21 +111,27 @@
             apt_pkg = _apt_pkg
         apt_pkg.init()
 
+        def get_fn(obj, new_name, old_name):
+            try:
+                return getattr(obj, new_name)
+            except AttributeError:
+                return getattr(obj, old_name)
+
         # Handle the case where the apt.sources file contains no source
         # URIs (LP:375897)
         try:
-            get_sources = getattr(apt_pkg, 'SourceRecords',
-                    getattr(apt_pkg, 'GetPkgSrcRecords', None))
+            get_sources = get_fn(apt_pkg, 'SourceRecords',
+                "GetPkgSrcRecords")
             sources = get_sources()
         except SystemError:
             raise PackageVersionNotPresent(package, upstream_version, self)
 
-        restart = getattr(sources, 'restart', getattr(sources, 'Restart', None))
+        restart = get_fn(sources, 'restart', 'Restart')
         restart()
         note("Using apt to look for the upstream tarball.")
-        lookup = getattr(sources, 'lookup', getattr(sources, 'Lookup', None))
+        lookup = get_fn(sources, 'lookup', 'Lookup')
         while lookup(package):
-            version = getattr(sources, 'version', getattr(sources, 'Version', None))
+            version = get_fn(sources, 'version', 'Version')
             if upstream_version == Version(version).upstream_version:
                 if self._run_apt_source(package, version, target_dir):
                     return