[Python-modules-commits] r6640 - in packages/nevow/trunk/debian (3 files)

[bernat at users.alioth.debian.org]

    Date: Wednesday, October 1, 2008 @ 12:59:30
  Author: bernat
Revision: 6640

Add a patch to make use of Twisted 8.x new plugin API instead of the
deprecated one (Closes: #500764).

Added:
  packages/nevow/trunk/debian/patches/pluginfix_twisted_8.patch
Modified:
  packages/nevow/trunk/debian/changelog
  packages/nevow/trunk/debian/patches/series

Modified: packages/nevow/trunk/debian/changelog
===================================================================
--- packages/nevow/trunk/debian/changelog	2008-10-01 11:50:45 UTC (rev 6639)
+++ packages/nevow/trunk/debian/changelog	2008-10-01 12:59:30 UTC (rev 6640)
@@ -1,3 +1,10 @@
+nevow (0.9.31-4) UNRELEASED; urgency=low
+
+  * Add a patch to make use of Twisted 8.x new plugin API instead of the
+    deprecated one (Closes: #500764).
+
+ -- Vincent Bernat <bernat at debian.org>  Wed, 01 Oct 2008 14:52:03 +0200
+
 nevow (0.9.31-3) unstable; urgency=low
 
   * Update dropin.cache in postinst and postrm

Added: packages/nevow/trunk/debian/patches/pluginfix_twisted_8.patch
===================================================================
--- packages/nevow/trunk/debian/patches/pluginfix_twisted_8.patch	                        (rev 0)
+++ packages/nevow/trunk/debian/patches/pluginfix_twisted_8.patch	2008-10-01 12:59:30 UTC (rev 6640)
@@ -0,0 +1,28 @@
+Index: /trunk/Nevow/twisted/plugins/nevow_widget.py
+===================================================================
+--- Nevow/twisted/plugins/nevow_widget.py (revision 12073)
++++ Nevow/twisted/plugins/nevow_widget.py (revision 15723)
+@@ -5,12 +5,19 @@
+ """
+ 
+-from twisted.scripts.mktap import _tapHelper
++try:
++    # Twisted 8.0.1 (r23252, to be precise) introduced a public API for
++    # this.
++    from twisted.application.service import ServiceMaker
++except ImportError:
++    # For versions of Twisted older than that, fallback to the private
++    # version of the same thing.
++    from twisted.scripts.mktap import _tapHelper as ServiceMaker
+ 
+-widgetServiceMaker = _tapHelper(
+-    "Widget Mathingwhathuh",
++widgetServiceMaker = ServiceMaker(
++    "Stand-alone Athena Widget runner",
+     "nevow._widget_plugin",
+     """
+     Create a service which starts a NevowSite with a single page with a single
+-    widget.
++    athena widget.
+     """,
+     "athena-widget")

Modified: packages/nevow/trunk/debian/patches/series
===================================================================
--- packages/nevow/trunk/debian/patches/series	2008-10-01 11:50:45 UTC (rev 6639)
+++ packages/nevow/trunk/debian/patches/series	2008-10-01 12:59:30 UTC (rev 6640)
@@ -1 +1,2 @@
 fix_manpage.patch
+pluginfix_twisted_8.patch