Remove need for 2to3.

2to3/fix_def_iteritems.py

@@ -1,22 +0,0 @@
-"""Fixer for iteritems -> items methods."""
-# Author: Valentin Lorentz
-
-# Code modified from fix_nonzero by Collin Winter
-
-from lib2to3 import fixer_base
-from lib2to3.fixer_util import Name, syms
-
-class FixDefIteritems(fixer_base.BaseFix):
-    BM_compatible = True
-    PATTERN = """
-    classdef< 'class' any+ ':'
-              suite< any*
-                     funcdef< 'def' name='iteritems'
-                              parameters< '(' NAME ')' > any+ >
-                     any* > >
-    """
-
-    def transform(self, node, results):
-        name = results["name"]
-        new = Name("items", prefix=name.prefix)
-        name.replace(new)

2to3/fix_def_iterkeys.py

@@ -1,22 +0,0 @@
-"""Fixer for iterkeys -> keys methods."""
-# Author: Valentin Lorentz
-
-# Code modified from fix_nonzero by Collin Winter
-
-from lib2to3 import fixer_base
-from lib2to3.fixer_util import Name, syms
-
-class FixDefIterkeys(fixer_base.BaseFix):
-    BM_compatible = True
-    PATTERN = """
-    classdef< 'class' any+ ':'
-              suite< any*
-                     funcdef< 'def' name='iterkeys'
-                              parameters< '(' NAME ')' > any+ >
-                     any* > >
-    """
-
-    def transform(self, node, results):
-        name = results["name"]
-        new = Name("keys", prefix=name.prefix)
-        name.replace(new)

2to3/fix_def_itervalues.py

@@ -1,22 +0,0 @@
-"""Fixer for itervalues -> values methods."""
-# Author: Valentin Lorentz
-
-# Code modified from fix_nonzero by Collin Winter
-
-from lib2to3 import fixer_base
-from lib2to3.fixer_util import Name, syms
-
-class FixDefItervalues(fixer_base.BaseFix):
-    BM_compatible = True
-    PATTERN = """
-    classdef< 'class' any+ ':'
-              suite< any*
-                     funcdef< 'def' name='itervalues'
-                              parameters< '(' NAME ')' > any+ >
-                     any* > >
-    """
-
-    def transform(self, node, results):
-        name = results["name"]
-        new = Name("values", prefix=name.prefix)
-        name.replace(new)

2to3/fix_import.py

@@ -1,106 +0,0 @@
-"""Fixer for import statements.
-If spam is being imported from the local directory, this import:
-    from spam import eggs
-Becomes:
-    from .spam import eggs
-
-And this import:
-    import spam
-Becomes:
-    from . import spam
-"""
-
-# Local imports
-from lib2to3 import fixer_base
-from os.path import dirname, join, exists, sep, split, isdir
-from os import listdir
-from lib2to3.fixer_util import FromImport, syms, token
-
-
-def traverse_imports(names):
-    """
-    Walks over all the names imported in a dotted_as_names node.
-    """
-    pending = [names]
-    while pending:
-        node = pending.pop()
-        if node.type == token.NAME:
-            yield node.value
-        elif node.type == syms.dotted_name:
-            yield "".join([ch.value for ch in node.children])
-        elif node.type == syms.dotted_as_name:
-            pending.append(node.children[0])
-        elif node.type == syms.dotted_as_names:
-            pending.extend(node.children[::-2])
-        else:
-            raise AssertionError("unkown node type")
-
-
-class FixImport(fixer_base.BaseFix):
-    BM_compatible = True
-
-    PATTERN = """
-    import_from< 'from' imp=any 'import' ['('] any [')'] >
-    |
-    import_name< 'import' imp=any >
-    """
-
-    def start_tree(self, tree, name):
-        super(FixImport, self).start_tree(tree, name)
-        self.skip = "absolute_import" in tree.future_features
-
-    def transform(self, node, results):
-        if self.skip:
-            return
-        imp = results['imp']
-
-        if node.type == syms.import_from:
-            # Some imps are top-level (eg: 'import ham')
-            # some are first level (eg: 'import ham.eggs')
-            # some are third level (eg: 'import ham.eggs as spam')
-            # Hence, the loop
-            while not hasattr(imp, 'value'):
-                imp = imp.children[0]
-            if self.probably_a_local_import(imp.value):
-                imp.value = "." + imp.value
-                imp.changed()
-        else:
-            have_local = False
-            have_absolute = False
-            for mod_name in traverse_imports(imp):
-                if self.probably_a_local_import(mod_name):
-                    have_local = True
-                else:
-                    have_absolute = True
-            if have_absolute:
-                if have_local:
-                    # We won't handle both sibling and absolute imports in the
-                    # same statement at the moment.
-                    self.warning(node, "absolute and local imports together")
-                return
-
-            new = FromImport(".", [imp])
-            new.prefix = node.prefix
-            return new
-
-    def probably_a_local_import(self, imp_name):
-        if imp_name.startswith("."):
-            # Relative imports are certainly not local imports.
-            return False
-        imp_name = imp_name.split(".", 1)[0]
-        base_path = dirname(self.filename)
-        base_path = join(base_path, imp_name)
-        # If there is no __init__.py next to the file its not in a package
-        # so can't be a relative import.
-        if not exists(join(dirname(base_path), "__init__.py")):
-            return False
-        (path, filename) = split(base_path)
-        if isdir(base_path) and filename in listdir(path):
-            # We use listdir too because of case-insensitivity on Windows
-            return True
-        for ext in [".py", ".pyc", ".so", ".sl", ".pyd"]:
-            if (filename + ext) in listdir(path):
-                # We use this instead of os.path.exists because of case-insensitivity
-                # on Windows
-                return True
-        return False

2to3/fix_reload.py

@@ -1,27 +0,0 @@
-# Based on fix_intern.py. Original copyright:
-# Copyright 2006 Georg Brandl.
-# Licensed to PSF under a Contributor Agreement.
-
-"""Fixer for intern().
-
-intern(s) -> sys.intern(s)"""
-
-# Local imports
-from lib2to3 import pytree
-from lib2to3 import fixer_base
-from lib2to3.fixer_util import Name, Attr, touch_import
-
-
-class FixReload(fixer_base.BaseFix):
-    BM_compatible = True
-    order = "pre"
-
-    PATTERN = """
-    power< 'reload'
-           after=any*
-    >
-    """
-
-    def transform(self, node, results):
-        touch_import('imp', 'reload', node)
-        return node

2to3/run.py

@@ -1,43 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-import shutil
-from glob import glob
-try:
-    from lib2to3.main import main
-except ImportError:
-    print('Error: you need the 2to3 tool to run this script.')
-os.chdir(os.path.join(os.path.dirname(__file__), '..'))
-try:
-    os.unlink('src/version.py')
-except OSError:
-    pass
-try:
-    shutil.rmtree('py3k')
-except OSError:
-    pass
-os.mkdir('py3k')
-for dirname in ('locales', 'docs', 'plugins', 'src', 'test', 'scripts'):
-    shutil.copytree(dirname, os.path.join('py3k', dirname))
-for filename in ('setup.py',):
-    shutil.copyfile(filename, os.path.join('py3k', filename))
-os.chdir('py3k')
-
-files = ['run.py', 'src', 'plugins', 'test', 'setup.py'] + glob('scripts/*')
-args = ['-wn']
-fixers = []
-for fix in ['all', 'def_iteritems', 'def_itervalues', 'def_iterkeys', 'reload', 'import']:
-    fixers += ['-f', fix]
-sys.argv = files + args + fixers + sys.argv
-sys.argc = len(sys.argv)
-
-from . import fix_def_iteritems, fix_def_itervalues, fix_def_iterkeys, fix_reload, fix_import
-
-# Hacks
-sys.modules['lib2to3.fixes.fix_def_iteritems'] = fix_def_iteritems
-sys.modules['lib2to3.fixes.fix_def_itervalues'] = fix_def_itervalues
-sys.modules['lib2to3.fixes.fix_def_iterkeys'] = fix_def_iterkeys
-sys.modules['lib2to3.fixes.fix_reload'] = fix_reload
-sys.modules['lib2to3.fixes.fix_import'] = fix_import
-
-sys.exit(main("lib2to3.fixes"))

plugins/Admin/__init__.py

@@ -45,12 +45,13 @@ __version__ = "%%VERSION%%"
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Aka/__init__.py

@@ -53,6 +53,7 @@ __url__ = '' # 'http://supybot.com/Members/yourname/Aka/download'
 from . import config
 from . import plugin
 from imp import reload
+from imp import reload
 # In case we're being reloaded.
 reload(config)
 reload(plugin)

plugins/Aka/plugin.py

@@ -38,7 +38,7 @@ import supybot.utils as utils
 import supybot.ircdb as ircdb
 from supybot.commands import *
 import supybot.plugins as plugins
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.ircutils as ircutils
 import supybot.callbacks as callbacks
 from supybot.i18n import PluginInternationalization

plugins/Aka/test.py

@@ -35,7 +35,7 @@ import supybot.plugin as plugin
 import supybot.registry as registry
 from supybot.minisix import u
 
-import plugin as Aka
+from . import plugin as Aka
 
 class FunctionsTest(SupyTestCase):
     def testFindBiggestDollar(self):

plugins/Alias/__init__.py

@@ -45,15 +45,16 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
-from plugin import findBiggestDollar, AliasError, escapeAlias, unescapeAlias # for the tests.
+from .plugin import findBiggestDollar, AliasError, escapeAlias, unescapeAlias # for the tests.
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Alias/plugin.py

@@ -35,7 +35,7 @@ import types
 import supybot.conf as conf
 import supybot.utils as utils
 from supybot.commands import *
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.ircutils as ircutils
 import supybot.registry as registry
 import supybot.callbacks as callbacks

plugins/Alias/test.py

@@ -34,7 +34,7 @@ import supybot.conf as conf
 import supybot.plugin as plugin
 import supybot.registry as registry
 
-import plugin as Alias
+from . import plugin as Alias
 
 class FunctionsTest(SupyTestCase):
     def testFindBiggestDollar(self):

plugins/Anonymous/__init__.py

@@ -45,14 +45,15 @@ __author__ = supybot.authors.strike
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/AutoMode/__init__.py

@@ -46,14 +46,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/BadWords/__init__.py

@@ -45,14 +45,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Channel/__init__.py

@@ -47,12 +47,13 @@ __contributors__ = {
     supybot.authors.skorobeus: ['enable', 'disable'],
     }
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/ChannelLogger/__init__.py

@@ -44,14 +44,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/ChannelLogger/plugin.py

@@ -36,7 +36,7 @@ import supybot.conf as conf
 import supybot.world as world
 import supybot.ircdb as ircdb
 import supybot.irclib as irclib
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.ircmsgs as ircmsgs
 import supybot.ircutils as ircutils
 import supybot.registry as registry

plugins/ChannelStats/__init__.py

@@ -46,14 +46,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Conditional/__init__.py

@@ -51,14 +51,15 @@ __contributors__ = {}
 # This is a url where the most recent plugin package can be downloaded.
 __url__ = '' # 'http://supybot.com/Members/yourname/Conditional/download'
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Config/__init__.py

@@ -44,12 +44,13 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Ctcp/__init__.py

@@ -43,14 +43,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Debug/__init__.py

@@ -46,6 +46,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
+from imp import reload
 if version_info[0] >= 3:
     from imp import reload
 reload(plugin) # In case we're being reloaded.

plugins/Dict/__init__.py

@@ -44,12 +44,13 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:
-    import test
+    from . import test
     
 Class = plugin.Class
 configure = config.configure

plugins/Dict/plugin.py

@@ -40,7 +40,7 @@ _ = PluginInternationalization('Dict')
 
 import random
 
-from local import dictclient
+from .local import dictclient
 
 class Dict(callbacks.Plugin):
     """This plugin provides a function to look up words from different

plugins/Dunno/__init__.py

@@ -48,14 +48,15 @@ __contributors__ = {
     supybot.authors.jemfinch: ['Flatfile DB implementation.'],
     }
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Factoids/__init__.py

@@ -48,14 +48,15 @@ __contributors__ = {}
 # This is a url where the most recent plugin package can be downloaded.
 __url__ = '' # 'http://supybot.com/Members/yourname/Factoids/download'
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Factoids/plugin.py

@@ -38,7 +38,7 @@ import supybot.ircdb as ircdb
 import supybot.utils as utils
 from supybot.commands import *
 import supybot.plugins as plugins
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.ircutils as ircutils
 import supybot.callbacks as callbacks
 import supybot.httpserver as httpserver

plugins/Filter/__init__.py

@@ -45,12 +45,13 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:
-    import test
+    from . import test
     
 Class = plugin.Class
 configure = config.configure

plugins/Filter/plugin.py

@@ -39,7 +39,7 @@ import random
 import supybot.conf as conf
 import supybot.utils as utils
 from supybot.commands import *
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.ircmsgs as ircmsgs
 import supybot.ircutils as ircutils
 import supybot.callbacks as callbacks

plugins/Format/__init__.py

@@ -44,12 +44,13 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:
-    import test
+    from . import test
     
 Class = plugin.Class
 configure = config.configure

plugins/GPG/__init__.py

@@ -52,6 +52,7 @@ __url__ = ''
 from . import config
 from . import plugin
 from imp import reload
+from imp import reload
 # In case we're being reloaded.
 reload(config)
 reload(plugin)

plugins/GPG/plugin.py

@@ -38,7 +38,7 @@ import supybot.conf as conf
 import supybot.utils as utils
 import supybot.ircdb as ircdb
 from supybot.commands import *
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.plugins as plugins
 import supybot.ircutils as ircutils
 import supybot.callbacks as callbacks

plugins/GPG/test.py

@@ -29,7 +29,7 @@
 ###
 
 from supybot.test import *
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 
 import supybot.gpg as gpg
 

plugins/Games/__init__.py

@@ -44,14 +44,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Google/__init__.py

@@ -44,14 +44,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Google/plugin.py

@@ -39,7 +39,7 @@ import supybot.conf as conf
 import supybot.utils as utils
 import supybot.world as world
 from supybot.commands import *
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.ircmsgs as ircmsgs
 import supybot.ircutils as ircutils
 import supybot.callbacks as callbacks

plugins/Herald/__init__.py

@@ -45,12 +45,13 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:
-    import test
+    from . import test
     
 Class = plugin.Class
 configure = config.configure

plugins/Internet/__init__.py

@@ -44,14 +44,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {supybot.authors.jamessan: ['whois']}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Karma/__init__.py

@@ -45,14 +45,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Karma/plugin.py

@@ -35,7 +35,7 @@ import csv
 import supybot.conf as conf
 import supybot.utils as utils
 from supybot.commands import *
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.plugins as plugins
 import supybot.ircmsgs as ircmsgs
 import supybot.ircutils as ircutils

plugins/Lart/__init__.py

@@ -45,14 +45,15 @@ __author__ = supybot.authors.strike
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Later/__init__.py

@@ -46,14 +46,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Limiter/__init__.py

@@ -44,14 +44,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Math/__init__.py

@@ -44,12 +44,13 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {supybot.Author('Keith Jones', 'kmj', ''): ['convert']}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Math/local/convertcore.py

@@ -13,7 +13,7 @@
 import re, copy, sys, os.path
 
 import supybot.conf as conf
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.registry as registry
 
 unitData = \

plugins/Math/plugin.py

@@ -38,13 +38,13 @@ import string
 
 import supybot.utils as utils
 from supybot.commands import *
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.callbacks as callbacks
 from supybot.i18n import PluginInternationalization, internationalizeDocstring
 _ = PluginInternationalization('Math')
 
 try:
-    from local import convertcore
+    from .local import convertcore
 except ImportError:
     from .local import convertcore
 

plugins/MessageParser/__init__.py

@@ -51,14 +51,15 @@ __contributors__ = {}
 # This is a url where the most recent plugin package can be downloaded.
 __url__ = '' # 'http://supybot.com/Members/yourname/MessageParser/download'
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/MessageParser/plugin.py

@@ -30,7 +30,7 @@
 
 import supybot.utils as utils
 from supybot.commands import *
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.plugins as plugins
 import supybot.ircutils as ircutils
 import supybot.callbacks as callbacks

plugins/Misc/__init__.py

@@ -44,12 +44,13 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:
-    import test
+    from . import test
     
 Class = plugin.Class
 configure = config.configure

plugins/Misc/plugin.py

@@ -44,7 +44,7 @@ import supybot.utils as utils
 from supybot.commands import *
 import supybot.ircdb as ircdb
 import supybot.irclib as irclib
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.ircmsgs as ircmsgs
 import supybot.ircutils as ircutils
 import supybot.callbacks as callbacks

plugins/MoobotFactoids/__init__.py

@@ -46,14 +46,15 @@ __author__ = supybot.authors.strike
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/MoobotFactoids/plugin.py

@@ -37,7 +37,7 @@ import supybot.ircdb as ircdb
 import supybot.utils as utils
 import supybot.shlex as shlex
 from supybot.commands import *
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.plugins as plugins
 import supybot.ircutils as ircutils
 import supybot.callbacks as callbacks

plugins/MoobotFactoids/test.py

@@ -40,7 +40,7 @@ try:
 except ImportError:
     sqlite = None
 
-import plugin
+from . import plugin
 MFconf = conf.supybot.plugins.MoobotFactoids
 
 class OptionListTestCase(SupyTestCase):

plugins/Network/__init__.py

@@ -45,12 +45,13 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:
-    import test
+    from . import test
     
 Class = plugin.Class
 configure = config.configure

plugins/News/__init__.py

@@ -48,14 +48,15 @@ __contributors__ = {}
 # This is a url where the most recent plugin package can be downloaded.
 __url__ = '' # 'http://supybot.com/Members/yourname/News/download'
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/NickAuth/__init__.py

@@ -49,14 +49,15 @@ __contributors__ = {}
 # This is a url where the most recent plugin package can be downloaded.
 __url__ = '' # 'http://supybot.com/Members/yourname/NickAuth/download'
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/NickCapture/__init__.py

@@ -45,14 +45,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Nickometer/__init__.py

@@ -65,14 +65,15 @@ __author__ = supybot.authors.baggins
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Nickometer/plugin.py

@@ -54,6 +54,7 @@ import math
 import string
 
 import supybot.utils as utils
+import supybot.utils.minisix as minisix
 import supybot.callbacks as callbacks
 from supybot.commands import wrap, additional
 from supybot.i18n import PluginInternationalization, internationalizeDocstring
@@ -90,7 +91,7 @@ class Nickometer(callbacks.Plugin):
         Tells you how lame said nick is.  If <nick> is not given, uses the
         nick of the person giving the command.
         """
-        score = 0L
+        score = minisix.L(0)
         if not nick:
             nick = msg.nick
         originalNick = nick

plugins/Note/__init__.py

@@ -45,14 +45,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = { supybot.authors.inkedmn: ['Original implementation.'] }
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Owner/__init__.py

@@ -45,12 +45,13 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Owner/plugin.py

@@ -48,7 +48,7 @@ import supybot.irclib as irclib
 import supybot.plugin as plugin
 import supybot.plugins as plugins
 import supybot.drivers as drivers
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.ircmsgs as ircmsgs
 import supybot.ircutils as ircutils
 import supybot.registry as registry
@@ -465,6 +465,7 @@ class Owner(callbacks.Plugin):
                 if hasattr(module, 'reload') and 'x' in locals():
                     module.reload(x)
                 if hasattr(module, 'config'):
+                    from imp import reload
                     reload(module.config)
                 for callback in callbacks:
                     callback.die()

plugins/Plugin/__init__.py

@@ -49,15 +49,16 @@ __contributors__ = {
     supybot.authors.skorobeus: ['contributors'],
     }
 
-import config
+from . import config
 # This had to be renamed because of stupid case-insensitivity issues.
-import plugin
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/PluginDownloader/__init__.py

@@ -50,14 +50,15 @@ __contributors__ = {}
 # This is a url where the most recent plugin package can be downloaded.
 __url__ = '' # 'http://supybot.com/Members/yourname/PluginDownloader/download'
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/PluginDownloader/plugin.py

@@ -39,7 +39,7 @@ import supybot.log as log
 import supybot.conf as conf
 import supybot.utils as utils
 from supybot.commands import *
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.plugins as plugins
 import supybot.ircutils as ircutils
 import supybot.callbacks as callbacks

plugins/PluginDownloader/test.py

@@ -33,7 +33,7 @@ import sys
 import shutil
 
 from supybot.test import *
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 
 pluginsPath = '%s/test-plugins' % os.getcwd()
 

plugins/Praise/__init__.py

@@ -45,14 +45,15 @@ __author__ = supybot.authors.strike
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Protector/__init__.py

@@ -45,14 +45,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Quote/__init__.py

@@ -45,14 +45,15 @@ __author__ = supybot.authors.strike
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/QuoteGrabs/__init__.py

@@ -49,12 +49,13 @@ __author__ = supybot.authors.strike
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:
-    import test
+    from . import test
     
 Class = plugin.Class
 configure = config.configure

plugins/QuoteGrabs/plugin.py

@@ -37,7 +37,7 @@ import supybot.dbi as dbi
 import supybot.conf as conf
 import supybot.utils as utils
 from supybot.commands import *
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.ircmsgs as ircmsgs
 import supybot.plugins as plugins
 import supybot.ircutils as ircutils

plugins/RSS/__init__.py

@@ -44,14 +44,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/RSS/plugin.py

@@ -44,7 +44,7 @@ import supybot.conf as conf
 import supybot.utils as utils
 import supybot.world as world
 from supybot.commands import *
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.ircmsgs as ircmsgs
 import supybot.ircutils as ircutils
 import supybot.registry as registry

plugins/RSS/test.py

@@ -32,7 +32,7 @@ import sys
 import feedparser
 from supybot.test import *
 import supybot.conf as conf
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 
 xkcd_old = """<?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>xkcd.com</title><link>http://xkcd.com/</link><description>xkcd.com: A webcomic of romance and math humor.</description><language>en</language><item><title>Snake Facts</title><link>http://xkcd.com/1398/</link><description>&lt;img src="http://imgs.xkcd.com/comics/snake_facts.png" title="Biologically speaking, what we call a 'snake' is actually a human digestive tract which has escaped from its host." alt="Biologically speaking, what we call a 'snake' is actually a human digestive tract which has escaped from its host." /&gt;</description><pubDate>Wed, 23 Jul 2014 04:00:00 -0000</pubDate><guid>http://xkcd.com/1398/</guid></item></channel></rss>

plugins/Relay/__init__.py

@@ -44,14 +44,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Reply/__init__.py

@@ -46,14 +46,15 @@ __author__ = supybot.authors.strike
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Scheduler/__init__.py

@@ -45,14 +45,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Scheduler/plugin.py

@@ -41,7 +41,7 @@ from supybot.i18n import PluginInternationalization, internationalizeDocstring
 _ = PluginInternationalization('Scheduler')
 import supybot.world as world
 
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 pickle = minisix.pickle
 
 datadir = conf.supybot.directories.data()

plugins/Seen/__init__.py

@@ -44,14 +44,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Seen/plugin.py

@@ -39,7 +39,7 @@ import supybot.world as world
 import supybot.ircdb as ircdb
 from supybot.commands import *
 import supybot.irclib as irclib
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.ircmsgs as ircmsgs
 import supybot.plugins as plugins
 import supybot.ircutils as ircutils

plugins/Services/__init__.py

@@ -44,14 +44,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Services/plugin.py

@@ -31,7 +31,7 @@
 import re
 import time
 
-import config
+from . import config
 
 import supybot.conf as conf
 import supybot.utils as utils

plugins/ShrinkUrl/__init__.py

@@ -44,14 +44,15 @@ __author__ = supybot.authors.jemfinch
 __contributors__ = {supybot.authors.jamessan: ['xrl.us support',
                                                'x0.no support']}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Status/__init__.py

@@ -45,12 +45,13 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:
-    import test
+    from . import test
     
 Class = plugin.Class
 configure = config.configure

plugins/String/__init__.py

@@ -44,14 +44,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/String/plugin.py

@@ -37,7 +37,7 @@ import binascii
 
 import supybot.utils as utils
 from supybot.commands import *
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.plugins as plugins
 import supybot.commands as commands
 import supybot.ircutils as ircutils

plugins/Success/__init__.py

@@ -46,14 +46,15 @@ __author__ = supybot.authors.strike
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Time/__init__.py

@@ -46,14 +46,15 @@ __contributors__ = {'tztime': supybot.Author('Valentin Lorentz', 'ProgVal',
                                             'progval@gmail.com')}
 
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Todo/__init__.py

@@ -45,14 +45,15 @@ __author__ = supybot.authors.strike
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Topic/__init__.py

@@ -44,14 +44,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = { supybot.authors.stepnem: ['persistence support'] }
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Topic/plugin.py

@@ -47,7 +47,7 @@ _ = PluginInternationalization('Topic')
 
 import supybot.ircdb as ircdb
 
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 pickle = minisix.pickle
 
 def canChangeTopic(irc, msg, args, state):

plugins/URL/__init__.py

@@ -46,14 +46,15 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/URL/plugin.py

@@ -32,7 +32,7 @@ import supybot.dbi as dbi
 import supybot.conf as conf
 import supybot.utils as utils
 from supybot.commands import *
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.plugins as plugins
 import supybot.ircmsgs as ircmsgs
 import supybot.ircutils as ircutils

plugins/Unix/__init__.py

@@ -47,14 +47,15 @@ __contributors__ = {}
 # This is a url where the most recent plugin package can be downloaded.
 __url__ = '' # 'http://supybot.com/Members/yourname/Unix/download'
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 
 if world.testing:
-    import test
+    from . import test
 
 Class = plugin.Class
 configure = config.configure

plugins/Unix/config.py

@@ -33,7 +33,7 @@ import supybot.registry as registry
 from supybot.i18n import PluginInternationalization, internationalizeDocstring
 _ = PluginInternationalization('Unix')
 
-import plugin
+from . import plugin
 
 progstats = plugin.progstats
 

plugins/Unix/plugin.py

@@ -42,7 +42,7 @@ import shlex
 
 import supybot.utils as utils
 from supybot.commands import *
-import supybot.minisix as minisix
+import supybot.utils.minisix as minisix
 import supybot.plugins as plugins
 import supybot.ircutils as ircutils
 import supybot.registry as registry

plugins/User/__init__.py

@@ -44,12 +44,13 @@ __author__ = supybot.authors.jemfinch
 # contributions.
 __contributors__ = {}
 
-import config
-import plugin
+from . import config
+from . import plugin
+from imp import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:
-    import test
+    from . import test
     
 Class = plugin.Class
 configure = config.configure