# HG changeset patch
# User Ralph Meijer <ralphm@ik.nu>
# Date 1212141368 0
# Node ID a219fe70a762aded99a8e2f35add8939c7580f88
# Parent  48245777aceafab3270e40d3c56aa1c39cd87570
Use ServiceMaker to setup twistd plugins, if available.

diff -r 48245777acea -r a219fe70a762 twisted/plugins/idavoll.py
--- a/twisted/plugins/idavoll.py	Sat May 17 18:31:31 2008 +0000
+++ b/twisted/plugins/idavoll.py	Fri May 30 09:56:08 2008 +0000
@@ -1,9 +1,12 @@
 # Copyright (c) 2003-2006 Ralph Meijer
 # See LICENSE for details.
 
-from twisted.scripts.mktap import _tapHelper
+try:
+    from twisted.application.service import ServiceMaker
+except ImportError:
+    from twisted.scripts.mktap import _tapHelper as ServiceMaker
 
-Idavoll = _tapHelper(
+Idavoll = ServiceMaker(
         "Idavoll",
         "idavoll.tap",
         "Jabber Publish-Subscribe Service Component",
diff -r 48245777acea -r a219fe70a762 twisted/plugins/idavoll_http.py
--- a/twisted/plugins/idavoll_http.py	Sat May 17 18:31:31 2008 +0000
+++ b/twisted/plugins/idavoll_http.py	Fri May 30 09:56:08 2008 +0000
@@ -1,9 +1,12 @@
 # Copyright (c) 2003-2008 Ralph Meijer
 # See LICENSE for details.
 
-from twisted.scripts.mktap import _tapHelper
+try:
+    from twisted.application.service import ServiceMaker
+except ImportError:
+    from twisted.scripts.mktap import _tapHelper as ServiceMaker
 
-Idavoll = _tapHelper(
+Idavoll = ServiceMaker(
         "Idavoll HTTP",
         "idavoll.tap_http",
         "Jabber Publish-Subscribe Service Component with HTTP gateway",