diff options
| author | Todd Eisenberger <todd@teisen.be> | 2011-09-27 10:14:18 -0700 |
|---|---|---|
| committer | Todd Eisenberger <todd@teisen.be> | 2011-09-27 10:14:18 -0700 |
| commit | 7b8a860de95f2af6855b1ba270e677a0eb4c044c (patch) | |
| tree | f55f6427c5176524d976abf17e94a6fb5e16cbc3 | |
| parent | 01f37195a86286010c966d045ec1609a9f5eb461 (diff) | |
| download | poezio-7b8a860de95f2af6855b1ba270e677a0eb4c044c.tar.gz poezio-7b8a860de95f2af6855b1ba270e677a0eb4c044c.tar.bz2 poezio-7b8a860de95f2af6855b1ba270e677a0eb4c044c.tar.xz poezio-7b8a860de95f2af6855b1ba270e677a0eb4c044c.zip | |
Fix loading already loaded plugins
| -rw-r--r-- | src/core.py | 8 | ||||
| -rw-r--r-- | src/plugin_manager.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core.py b/src/core.py index 1f60e252..1a4d1f2d 100644 --- a/src/core.py +++ b/src/core.py @@ -129,8 +129,8 @@ class Core(object): 'server_cycle': (self.command_server_cycle, _('Usage: /server_cycle [domain] [message]\nServer Cycle: disconnect and reconnects in all the rooms in domain.'), None), 'bind': (self.command_bind, _('Usage: /bind <key> <equ>\nBind: bind a key to an other key or to a “command”. For example "/bind ^H KEY_UP" makes Control + h do the same same than the Up key.'), None), 'pubsub': (self.command_pubsub, _('Usage: /pubsub <domain>\nPubsub: Open a pubsub browser on the given domain'), None), - 'load': (self.command_load, _('Usage: /load <script.py>\nLoad: Load the specified python script'), self.plugin_manager.completion_load), - 'unload': (self.command_unload, _('Usage: /unload <script.py>\nUnload: Unload the specified python script'), self.plugin_manager.completion_unload), + 'load': (self.command_load, _('Usage: /load <plugin>\nLoad: Load the specified plugin'), self.plugin_manager.completion_load), + 'unload': (self.command_unload, _('Usage: /unload <plugin>\nUnload: Unload the specified plugin'), self.plugin_manager.completion_unload), } self.key_func = { @@ -1137,7 +1137,7 @@ class Core(object): def command_load(self, arg): """ - /load <script.py> + /load <plugin> """ args = arg.split() if len(args) != 1: @@ -1148,7 +1148,7 @@ class Core(object): def command_unload(self, arg): """ - /unload <script.py> + /unload <plugin> """ args = arg.split() if len(args) != 1: diff --git a/src/plugin_manager.py b/src/plugin_manager.py index 1f0e89eb..df96e9ab 100644 --- a/src/plugin_manager.py +++ b/src/plugin_manager.py @@ -37,7 +37,7 @@ class PluginManager(object): def load(self, name): if name in self.plugins: - self.plugins[name].unload() + self.unload(name) try: if name in self.modules: |