Updated to work with the new supybot-test.

plugins/Admin/__init__.py

@@ -33,6 +33,7 @@ caller to have the 'admin' capability.  This plugin is loaded by default.
 """
 
 import supybot
+import supybot.world as world
 
 __author__ = supybot.authors.jemfinch
 
@@ -44,8 +45,8 @@ import config
 import plugin
 reload(plugin) # In case we're being reloaded.
 
-if hasattr(plugin, '__doc__') and plugin.__doc__:
-    __doc__ = plugin.__doc__
+if world.testing:
+    import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Channel/__init__.py

@@ -33,6 +33,7 @@ to have the <channel>.op capability.  This plugin is loaded by default.
 """
 
 import supybot
+import supybot.world as world
 
 __author__ = supybot.authors.jemfinch
 
@@ -46,9 +47,8 @@ import config
 import plugin
 reload(plugin) # In case we're being reloaded.
 
-# Backwards compatibility.
-if hasattr(plugin, '__doc__') and plugin.__doc__:
-    __doc__ = plugin.__doc__
+if world.testing:
+    import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Config/__init__.py

@@ -32,6 +32,7 @@ Handles configuration of the bot while it is running.
 """
 
 import supybot
+import supybot.world as world
 
 __author__ = supybot.authors.jemfinch
 
@@ -43,9 +44,8 @@ import config
 import plugin
 reload(plugin) # In case we're being reloaded.
 
-# Backwards compatibility.
-if hasattr(plugin, '__doc__') and plugin.__doc__:
-    __doc__ = plugin.__doc__
+if world.testing:
+    import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Misc/__init__.py

@@ -32,6 +32,7 @@ Miscellaneous commands.
 """
 
 import supybot
+import supybot.world as world
 
 __author__ = supybot.authors.jemfinch
 
@@ -45,9 +46,8 @@ import config
 import plugin
 reload(plugin) # In case we're being reloaded.
 
-# Backwards compatibility.
-if hasattr(plugin, '__doc__') and plugin.__doc__:
-    __doc__ = plugin.__doc__
-
+if world.testing:
+    import test
+    
 Class = plugin.Class
 configure = config.configure

plugins/Owner/__init__.py

@@ -33,6 +33,7 @@ their caller to have the 'owner' capability.  This plugin is loaded by default.
 """
 
 import supybot
+import supybot.world as world
 
 __author__ = supybot.authors.jemfinch
 
@@ -44,9 +45,8 @@ import config
 import plugin
 reload(plugin) # In case we're being reloaded.
 
-# Backwards compatibility.
-if hasattr(plugin, '__doc__') and plugin.__doc__:
-    __doc__ = plugin.__doc__
+if world.testing:
+    import test
 
 Class = plugin.Class
 configure = config.configure

plugins/User/__init__.py

@@ -32,6 +32,7 @@ Provides commands useful to users in general. This plugin is loaded by default.
 """
 
 import supybot
+import supybot.world as world
 
 __author__ = supybot.authors.jemfinch
 
@@ -43,9 +44,8 @@ import config
 import plugin
 reload(plugin) # In case we're being reloaded.
 
-# Backwards compatibility.
-if hasattr(plugin, '__doc__') and plugin.__doc__:
-    __doc__ = plugin.__doc__
-
+if world.testing:
+    import test
+    
 Class = plugin.Class
 configure = config.configure

scripts/supybot-newplugin

@@ -29,8 +29,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 ###
 
-
-
 import supybot
 
 import os
@@ -136,6 +134,7 @@ here.
 """
 
 import supybot
+import supybot.world as world
 
 # XXX Replace this with an appropriate author or supybot.Author instance.
 __author__ = supybot.authors.unknown
@@ -148,10 +147,9 @@ import config
 import plugin
 reload(plugin) # In case we\'re being reloaded.
 
-# For backwards compatibility with the old Plugin format.
-if hasattr(plugin, '__doc__') and plugin.__doc__:
-    __doc__ = plugin.__doc__
-
+if world.testing:
+    import test
+    
 Class = plugin.Class
 configure = config.configure