GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-27 04:59:24 +01:00
Code Issues Projects Releases Wiki Activity

Revert "pylink: use sys.path instead of imp library hacks"

Browse Source 
This reverts commit cf2ba4b492.
This commit is contained in:
James Lu 2015-09-27 12:11:59 -07:00
parent 4a9a29e095
commit 38a350a5f8
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pylink
View File

@ -4,12 +4,9 @@ import imp
import os
import sys
# cd into the PyLink root directory first...
# This must be done before conf imports, so we get the real conf instead of testing one.
os.chdir(os.path.dirname(__file__))
import world
# This must be set before conf imports, so we get the real conf instead of testing one.
world.testing = False
import conf
@ -22,7 +19,7 @@ if __name__ == '__main__':
if conf.conf['login']['password'] == 'changeme':
log.critical("You have not set the login details correctly! Exiting...")
sys.exit(2)
protocols_folder = os.path.join(os.getcwd(), 'protocols')
protocols_folder = [os.path.join(os.getcwd(), 'protocols')]
# Write a PID file.
with open('%s.pid' % conf.confname, 'w') as f:
@ -31,11 +28,14 @@ if __name__ == '__main__':
# Import plugins first globally, because they can listen for events
# that happen before the connection phase.
to_load = conf.conf['plugins']
plugins_folder = os.path.join(os.getcwd(), 'plugins')
sys.path.extend([plugins_folder, protocols_folder])
plugins_folder = [os.path.join(os.getcwd(), 'plugins')]
# Here, we override the module lookup and import the plugins
# dynamically depending on which were configured.
for plugin in to_load:
try:
world.plugins[plugin] = pl = __import__(plugin)
moduleinfo = imp.find_module(plugin, plugins_folder)
pl = imp.load_source(plugin, moduleinfo[1])
world.plugins[plugin] = pl
except ImportError as e:
if str(e) == ('No module named %r' % plugin):
log.error('Failed to load plugin %r: The plugin could not be found.', plugin)
@ -49,7 +49,8 @@ if __name__ == '__main__':
for network in conf.conf['servers']:
protoname = conf.conf['servers'][network]['protocol']
try:
proto = __import__(protoname)
moduleinfo = imp.find_module(protoname, protocols_folder)
proto = imp.load_source(protoname, moduleinfo[1])
except ImportError as e:
if str(e) == ('No module named %r' % protoname):
log.critical('Failed to load protocol module %r: The file could not be found.', protoname)
@ -57,7 +58,6 @@ if __name__ == '__main__':
log.critical('Failed to load protocol module: ImportError: %s', protoname, str(e))
sys.exit(2)
else:
world.networkobjects[network] = irc = classes.Irc(network, proto)
irc.plugins_folder = plugins_folder
world.networkobjects[network] = classes.Irc(network, proto)
world.started.set()
log.info("loaded plugins: %s", world.plugins)