Use importlib instead of imp.

importlib is deprecated.

plugins/Admin/__init__.py

@@ -48,7 +48,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:

plugins/Aka/__init__.py

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

plugins/Alias/__init__.py

@@ -48,7 +48,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Anonymous/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/AutoMode/__init__.py

@@ -49,7 +49,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/BadWords/__init__.py

@@ -48,7 +48,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Channel/__init__.py

@@ -50,7 +50,7 @@ __contributors__ = {
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:

plugins/ChannelLogger/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/ChannelStats/__init__.py

@@ -49,7 +49,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Conditional/__init__.py

@@ -53,7 +53,7 @@ __url__ = '' # 'http://supybot.com/Members/yourname/Conditional/download'
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Config/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:

plugins/Ctcp/__init__.py

@@ -46,7 +46,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Debug/__init__.py

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

plugins/Dict/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib import reload
 from .local import dictclient
 reload(plugin) # In case we're being reloaded.
 reload(dictclient)

plugins/Dunno/__init__.py

@@ -51,7 +51,7 @@ __contributors__ = {
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Factoids/__init__.py

@@ -51,7 +51,7 @@ __url__ = '' # 'http://supybot.com/Members/yourname/Factoids/download'
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Filter/__init__.py

@@ -48,7 +48,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:

plugins/Format/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:

plugins/GPG/__init__.py

@@ -51,8 +51,8 @@ __url__ = ''
 
 from . import config
 from . import plugin
-from imp import reload
-from imp import reload
+from importlib import reload
+from importlib import reload
 # In case we're being reloaded.
 reload(config)
 reload(plugin)

plugins/Games/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Google/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Hashes/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Herald/__init__.py

@@ -48,7 +48,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:

plugins/Internet/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {supybot.authors.jamessan: ['whois']}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Karma/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Lart/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Later/__init__.py

@@ -49,7 +49,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Limiter/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Math/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {supybot.Author('Keith Jones', 'kmj', ''): ['convert']}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib import reload
 from .local import convertcore
 reload(plugin) # In case we're being reloaded.
 reload(convertcore)

plugins/MessageParser/__init__.py

@@ -52,7 +52,7 @@ __url__ = ''
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Misc/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:

plugins/Misc/plugin.py

@@ -30,7 +30,6 @@
 
 import re
 import os
-import imp
 import sys
 import json
 import time
@@ -58,12 +57,6 @@ _ = PluginInternationalization('Misc')
 if minisix.PY2:
     from itertools import ifilter as filter
 
-def get_suffix(file):
-    for suffix in imp.get_suffixes():
-        if file[-len(suffix[0]):] == suffix[0]:
-            return suffix
-    return None
-
 def getPluginsInDirectory(directory):
     # get modules in a given directory
     plugins = []

plugins/MoobotFactoids/__init__.py

@@ -49,7 +49,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Network/__init__.py

@@ -48,7 +48,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:

plugins/News/__init__.py

@@ -51,7 +51,7 @@ __url__ = '' # 'http://supybot.com/Members/yourname/News/download'
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/NickAuth/__init__.py

@@ -51,7 +51,7 @@ __url__ = ''
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/NickCapture/__init__.py

@@ -48,7 +48,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Nickometer/__init__.py

@@ -67,7 +67,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Note/__init__.py

@@ -48,7 +48,7 @@ __contributors__ = { supybot.authors.inkedmn: ['Original implementation.'] }
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Owner/__init__.py

@@ -48,7 +48,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:

plugins/Owner/plugin.py

@@ -478,7 +478,7 @@ class Owner(callbacks.Plugin):
                 if hasattr(module, 'reload') and 'x' in locals():
                     module.reload(x)
                 if hasattr(module, 'config'):
-                    from imp import reload
+                    from importlib import reload
                     reload(module.config)
                 for callback in callbacks:
                     callback.die()

plugins/Plugin/__init__.py

@@ -49,7 +49,7 @@ __contributors__ = {
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/PluginDownloader/__init__.py

@@ -52,7 +52,7 @@ __url__ = '' # 'http://supybot.com/Members/yourname/PluginDownloader/download'
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/PluginDownloader/plugin.py

@@ -147,7 +147,7 @@ class GithubRepository(GitRepository):
                                         reload_imported = True
                                     elif not reload_imported and \
                                             b'reload(' in line:
-                                        fd.write(b'from imp import reload\n')
+                                        fd.write(b'from importlib import reload\n')
                                         reload_imported = True
                                 fd.write(line)
                     if newFileName.endswith('__init__.py'):

plugins/Praise/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Protector/__init__.py

@@ -48,7 +48,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Quote/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/QuoteGrabs/__init__.py

@@ -51,7 +51,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:

plugins/RSS/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Relay/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Reply/__init__.py

@@ -48,7 +48,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Scheduler/__init__.py

@@ -48,7 +48,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Seen/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Services/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/ShrinkUrl/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {supybot.authors.jamessan: ['xrl.us support',
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Status/__init__.py

@@ -48,7 +48,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:

plugins/String/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Success/__init__.py

@@ -48,7 +48,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Time/__init__.py

@@ -50,7 +50,7 @@ __contributors__ = {supybot.authors.progval: ['tztime'],
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Todo/__init__.py

@@ -48,7 +48,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Topic/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = { supybot.authors.stepnem: ['persistence support'] }
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/URL/__init__.py

@@ -49,7 +49,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/Unix/__init__.py

@@ -50,7 +50,7 @@ __url__ = '' # 'http://supybot.com/Members/yourname/Unix/download'
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

plugins/User/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:

plugins/Utilities/__init__.py

@@ -47,7 +47,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib import reload
 reload(plugin) # In case we're being reloaded.
 
 if world.testing:

plugins/Web/__init__.py

@@ -45,7 +45,7 @@ __contributors__ = {}
 
 from . import config
 from . import plugin
-from imp import reload
+from importlib 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!

src/plugin.py

@@ -28,11 +28,15 @@
 ###
 
 import os
+import re
 import sys
-import imp
 import os.path
 import linecache
-import re
+import importlib.util
+
+if not hasattr(importlib.util, 'module_from_spec'):
+    # Python < 3.5
+    import imp
 
 from . import callbacks, conf, log, registry
 
@@ -60,8 +64,19 @@ def loadPluginModule(name, ignoreDeprecation=False):
             name = matched_names[0]
         else:
             raise ImportError(name)
-    moduleInfo = imp.find_module(name, pluginDirs)
+
     try:
+        if hasattr(importlib.util, 'module_from_spec'):
+            # Python >= 3.5
+            spec = importlib.machinery.PathFinder.find_spec(name, pluginDirs)
+            if spec is None:
+                assert ImportError(name)
+            module = importlib.util.module_from_spec(spec)
+            sys.modules[module.__name__] = module
+            spec.loader.exec_module(module)
+        else:
+            # Python < 3.5
+            moduleInfo = imp.find_module(name, pluginDirs)
             module = imp.load_module(name, *moduleInfo)
     except:
         sys.modules.pop(name, None)