Merge lp:~gz/bzr-pipeline/no_launchpadlib_needed_601466 into lp:bzr-pipeline

[Martin Packman]

Removes the dependency on launchpadlib, for real this time. Adds to the fix attempted in r170 work by catching the correct exception.

Unmerged revisions

173. By Martin Packman on 2010-07-03

Remove need for launchpadlib to be installed by catching bzrlib.errors.DependencyNotPresent

=== modified file '__init__.py'
--- __init__.py	2010-04-24 04:37:09 +0000
+++ __init__.py	2010-07-03 21:13:25 +0000
@@ -106,7 +106,7 @@
 
 
 import bzrlib
-from bzrlib import api
+from bzrlib import api, errors
 from bzrlib.commands import plugin_cmds
 from bzrlib.directory_service import AliasDirectory, directories
 
@@ -160,7 +160,7 @@
 try:
     from bzrlib.plugins.launchpad import lp_api
     from bzrlib.plugins.launchpad import lp_propose
-except ImportError:
+except (ImportError, errors.DependencyNotPresent):
     pass
 else:
     def get_prerequisite_from_pipe(hook_params):