Rev 5631: Enhance compatibility with old launchpadlib versions in file:///home/vila/src/bzr/bugs/706835-lp-uris/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/706835-lp-uris/

------------------------------------------------------------
revno: 5631
revision-id: v.ladeuil+lp at free.fr-20110124091054-9xhh3jyuf03mari6
parent: pqm at pqm.ubuntu.com-20110121232118-bhaglx42njlyciqd
fixes bug(s): https://launchpad.net/bugs/706835
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 706835-lp-uris
timestamp: Mon 2011-01-24 10:10:54 +0100
message:
  Enhance compatibility with old launchpadlib versions
-------------- next part --------------
=== modified file 'bzrlib/plugins/launchpad/lp_api.py'
--- a/bzrlib/plugins/launchpad/lp_api.py	2011-01-19 01:03:43 +0000
+++ b/bzrlib/plugins/launchpad/lp_api.py	2011-01-24 09:10:54 +0000
@@ -47,7 +47,12 @@
     STAGING_SERVICE_ROOT,
     Launchpad,
     )
-from launchpadlib import uris
+try:
+    from launchpadlib import uris
+except ImportError:
+    # Create a minimal object so the getattr() calls below fail gently and
+    # provide default values
+    uris = object()
 
 LPNET_SERVICE_ROOT = getattr(uris, 'LPNET_SERVICE_ROOT',
                              'https://api.launchpad.net/beta/')

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-01-21 23:21:18 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-01-24 09:10:54 +0000
@@ -41,21 +41,24 @@
   roll back the target branch. (Jelmer Vernooij, #386576)
 
 * ``bzr lp-propose`` can now propose merges against packaging branches on
-  Launhcpad without requiring the target branch to be specified. (Jelmer Vernooij,
-  #704647)
+  Launhcpad without requiring the target branch to be specified.
+  (Jelmer Vernooij, #704647)
 
-* ``bzr lp-propose`` no longer requires a reviewer to be specified. It will instead
-  leave setting the reviewer up to Launchpad if it was not specified.
+* ``bzr lp-propose`` no longer requires a reviewer to be specified. It will
+  instead leave setting the reviewer up to Launchpad if it was not specified.
   (Jelmer Vernooij, #583772)
 
 * ``bzr pull`` will now exit with exit code 1 if there were tag conflicts.
   (Jelmer Vernooij, #213185)
 
-* ``bzr serve`` no longer crashes when a server_started hook is installed and IPv6
-  support is available on the system. (Jelmer Vernooij, #293697)
-
-* ``bzr whoami`` will now display an error if both a new identity and ``--email``
-  were specified. (Jelmer Vernooij, #680449)
+* ``bzr serve`` no longer crashes when a server_started hook is installed and
+  IPv6 support is available on the system. (Jelmer Vernooij, #293697)
+
+* ``bzr whoami`` will now display an error if both a new identity and
+  ``--email`` were specified. (Jelmer Vernooij, #680449)
+
+* ``launchpadlib`` doesn't provide the ``uris`` module in some old versions.
+  (Vincent Ladeuil, #706835)
 
 * Plugins incompatible with the current version of bzr no longer produce a
   warning on every command invocation.  Instead, a message is shown by