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

[Michael Vogt]

This will make the Version.uri method return None if there is no uri for this version instead of a StopIteration exception. This seems conceptually cleaner.

[Julian Andres Klode (juliank)]

That seems fine.

review: Approve

[Michael Vogt (mvo)]

On Tue, Mar 27, 2012 at 09:30:36AM -0000, Julian Andres Klode wrote:
> Review: Approve
>
> That seems fine.

Great, thanks a bunch.

Cheers,
 Michael

=== modified file 'apt/package.py'
--- apt/package.py	2012-01-30 14:46:34 +0000
+++ apt/package.py	2012-03-27 09:29:17 +0000
@@ -545,7 +545,10 @@
 
         .. versionadded:: 0.7.10
         """
-        return iter(self._uris()).next()
+        try:
+            return iter(self._uris()).next()
+        except StopIteration:
+            return None
 
     def fetch_binary(self, destdir='', progress=None):
         """Fetch the binary version of the package.

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-05 12:05:39 +0000
+++ debian/changelog	2012-03-27 09:29:17 +0000
@@ -14,6 +14,8 @@
   * python/tag.cc, tests/test_tagfile.py:
     - add support a filename argument in apt_pkg.TagFile() (in addition
       to the file object currently supported)
+  * apt/package.py:
+    - if there is no Version.uri return None
 
   [Julian Andres Klode ]
   * python/apt_pkgmodule.cc: