[Python-modules-commits] r15966 - in packages/sphinx-issuetracker/trunk/debian (3 files)

[fladi-guest at users.alioth.debian.org]

    Date: Thursday, March 3, 2011 @ 13:39:21
  Author: fladi-guest
Revision: 15966

Add patch to handle missing packages.

Added:
  packages/sphinx-issuetracker/trunk/debian/patches/handle_missing_packages.patch
Modified:
  packages/sphinx-issuetracker/trunk/debian/changelog
  packages/sphinx-issuetracker/trunk/debian/patches/series

Modified: packages/sphinx-issuetracker/trunk/debian/changelog
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/changelog	2011-03-03 12:45:20 UTC (rev 15965)
+++ packages/sphinx-issuetracker/trunk/debian/changelog	2011-03-03 13:39:21 UTC (rev 15966)
@@ -10,8 +10,10 @@
     presence of files.
   * Add patch to disable issuetracker integration during build to prevent
     network access.
+  * Add patch to gracefully handle exceptions caused by missing
+    packages.
 
- -- Fladischer Michael <FladischerMichael at fladi.at>  Thu, 03 Mar 2011 13:43:52 +0100
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Thu, 03 Mar 2011 14:39:00 +0100
 
 sphinx-issuetracker (0.5.4-1) experimental; urgency=low
 

Added: packages/sphinx-issuetracker/trunk/debian/patches/handle_missing_packages.patch
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/patches/handle_missing_packages.patch	                        (rev 0)
+++ packages/sphinx-issuetracker/trunk/debian/patches/handle_missing_packages.patch	2011-03-03 13:39:21 UTC (rev 15966)
@@ -0,0 +1,47 @@
+Description: Handle ImportError more gracefully
+ To assist users who do not install the Recommends, enhance the message for 
+ ImportError exceptions related to those packages.
+Author: Fladischer Michael <FladischerMichael at fladi.at>
+Last-Update: 2011-03-03
+Forwarded: not-needed
+
+Index: sphinx-issuetracker/sphinxcontrib/issuetracker.py
+===================================================================
+--- sphinx-issuetracker.orig/sphinxcontrib/issuetracker.py	2011-03-03 13:46:49.021538024 +0100
++++ sphinx-issuetracker/sphinxcontrib/issuetracker.py	2011-03-03 14:15:20.419236885 +0100
+@@ -75,7 +75,10 @@
+ 
+ 
+ def get_bitbucket_issue_information(app, project, user, issue_id):
+-    from lxml.html import parse
++    try:
++        from lxml.html import parse
++    except ImportError, e:
++        raise ImportError("%s (install package python-lxml)" % e)
+ 
+     uri = BITBUCKET_URL % locals()
+     with closing(urllib.urlopen(uri)) as response:
+@@ -94,7 +97,10 @@
+ 
+ 
+ def get_debian_issue_information(app, project, user, issue_id):
+-    import debianbts
++    try:
++        import debianbts
++    except ImportError, e:
++        raise ImportError("%s (install package python-debianbts)" % e)
+     try:
+         # get the bug
+         bug = debianbts.get_status(debianbts.get_bugs("bugs", issue_id))[0]
+@@ -112,7 +118,10 @@
+ def get_launchpad_issue_information(app, project, user, issue_id):
+     launchpad = getattr(app.env, 'issuetracker_launchpad', None)
+     if not launchpad:
+-        from launchpadlib.launchpad import Launchpad
++        try:
++            from launchpadlib.launchpad import Launchpad
++        except ImportError, e:
++            raise ImportError("%s (install package python-launchpadlib)" % e)
+         launchpad = Launchpad.login_anonymously(
+             'sphinxcontrib.issuetracker', service_root='production')
+         app.env.issuetracker_launchpad = launchpad

Modified: packages/sphinx-issuetracker/trunk/debian/patches/series
===================================================================
--- packages/sphinx-issuetracker/trunk/debian/patches/series	2011-03-03 12:45:20 UTC (rev 15965)
+++ packages/sphinx-issuetracker/trunk/debian/patches/series	2011-03-03 13:39:21 UTC (rev 15966)
@@ -1,2 +1,3 @@
 intersphinx_mapping.patch
 disable_issuetracker.patch
+handle_missing_packages.patch