Merge lp:~stevenk/launchpad/better-error-+archivesubscriptions into lp:launchpad

[Steve Kowalik]

[r=wallyworld][bug=891607] Deal with the case where the archive id is not a number for Person:+archivesubscriptions.

Deal with the case where the archive id is not a number, and return not found.

[Ian Booth (wallyworld)]

Looks good. Sometimes where are tests which check the http error code (eg 404 in this case) for given scenarios. Are there any of those which need updating?

review: Approve

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2012-01-17 23:55:44 +0000
+++ lib/lp/registry/browser/person.py	2012-01-23 22:40:29 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 # pylint: disable-msg=E0211,E0213,C0322
@@ -497,6 +497,8 @@
             # In which case we assume it is the archive_id (for the
             # moment, archive name will be an option soon).
             archive_id = self.request.stepstogo.consume()
+            if not archive_id.isdigit():
+                return None
             return traverse_archive_subscription_for_subscriber(
                 self.context, archive_id)
         else:

=== modified file 'lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt'
--- lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt	2012-01-15 13:32:27 +0000
+++ lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt	2012-01-23 22:40:29 +0000
@@ -221,3 +221,11 @@
     PPA named p3a for Mark Shuttleworth (ppa:mark/p3a) Mark Shuttleworth View
     PPA named p3a for Celso Providelo (ppa:cprov/p3a)  Celso Providelo   View
 
+== Attempting to browse directly to a subscription ==
+
+    >>> joe_browser.open(
+    ...     "http://launchpad.dev/~joesmith/+archivesubscriptions/foo")
+    Traceback (most recent call last):
+    ...
+    NotFound...
+