Merge branch 'master' into patch-listener-plugins
commit
8601f93e1a
|
@ -2,6 +2,7 @@ import imp
|
||||||
import os
|
import os
|
||||||
import ssl
|
import ssl
|
||||||
import time
|
import time
|
||||||
|
import pinhook.plugin
|
||||||
|
|
||||||
import irc.bot
|
import irc.bot
|
||||||
|
|
||||||
|
@ -54,6 +55,8 @@ class Bot(irc.bot.SingleServerIRCBot):
|
||||||
setattr(self, a, kwarguments[a])
|
setattr(self, a, kwarguments[a])
|
||||||
|
|
||||||
def load_plugins(self):
|
def load_plugins(self):
|
||||||
|
# clear plugin list to ensure no old plugins remain
|
||||||
|
pinhook.plugin.clear_plugins()
|
||||||
# ensure plugin folder exists
|
# ensure plugin folder exists
|
||||||
if not os.path.exists(self.plugin_dir):
|
if not os.path.exists(self.plugin_dir):
|
||||||
os.makedirs(self.plugin_dir)
|
os.makedirs(self.plugin_dir)
|
||||||
|
|
Loading…
Reference in New Issue