Merge lp:~gz/bzr-builddeb/trivial_apt_pkg_compat_tweak into lp:bzr-builddeb

[Martin Packman]

Just tweak the way fallback is done for older apt_pkg versions so a deprecation warning is not triggered by accessing the old (capitalised) names unless the new (lowercase) ones do not exist.

Without this, using `bzr info apt:...` (which is really neat by the way) on squeeze gets me:

.../bzrlib/plugins/builddeb/directory.py:47: DeprecationWarning: Attribute 'Lookup'
of the 'apt_pkg.SourceRecords' object is deprecated, use 'lookup' instead.
  lookup = getattr(sources, 'lookup', getattr(sources, 'Lookup', None))
.../bzrlib/plugins/builddeb/directory.py:49: DeprecationWarning: Attribute 'Record'
of the 'apt_pkg.SourceRecords' object is deprecated, use 'record' instead.
  record = getattr(sources, 'record', getattr(sources, 'Record', None))
Retrieving Vcs locating from python-debian Debian version 0.1.18

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'directory.py'
--- directory.py	2011-07-22 20:12:14 +0000
+++ directory.py	2011-10-21 08:57:26 +0000
@@ -44,9 +44,9 @@
             sources = apt_pkg.GetPkgSrcRecords()
 
         urls = {}
-        lookup = getattr(sources, 'lookup', getattr(sources, 'Lookup', None))
+        lookup = getattr(sources, 'lookup', None) or sources.Lookup
         while lookup(name):
-            record = getattr(sources, 'record', getattr(sources, 'Record', None))
+            record = getattr(sources, 'record', None) or sources.Record
             for l in record.splitlines():
                 if not ": " in l:
                     continue