diff options
| author | Martin Sivak <msivak@redhat.com> | 2007-11-12 10:35:07 +0100 |
|---|---|---|
| committer | Martin Sivak <msivak@redhat.com> | 2007-11-12 10:35:07 +0100 |
| commit | 18154c90b416674d24caba5b4eda76f743a68cc4 (patch) | |
| tree | a1c72625272ced0936bae7cb59795b61e8ead239 | |
| parent | 7b3368d2d081397df31b17b9e693af002ee1f7d7 (diff) | |
| download | firstaidkit-18154c90b416674d24caba5b4eda76f743a68cc4.tar.gz firstaidkit-18154c90b416674d24caba5b4eda76f743a68cc4.tar.xz firstaidkit-18154c90b416674d24caba5b4eda76f743a68cc4.zip | |
Make the source importable, fix typos and stuff
| -rw-r--r-- | tasker/configuration.py | 3 | ||||
| -rw-r--r-- | tasker/plugins.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tasker/configuration.py b/tasker/configuration.py index 1cfd459..d8c60a1 100644 --- a/tasker/configuration.py +++ b/tasker/configuration.py @@ -1,5 +1,6 @@ import ConfigParser import os +from StringIO import StringIO if os.environ.has_key("FIRST_AID_KIT_CONF"): cfgfile = os.environ["FIRST_AID_KIT_CONF"].split(":") @@ -44,7 +45,7 @@ class FAKConfig(ConfigParser.SafeConfigParser, FAKConfigMixIn): pass Config = FAKConfig() -Config.readfp(defaultconfig, "<default>") +Config.readfp(StringIO(defaultconfig), "<default>") Config.read(cfgfile) diff --git a/tasker/plugins.py b/tasker/plugins.py index 9d5caf9..6b7e491 100644 --- a/tasker/plugins.py +++ b/tasker/plugins.py @@ -140,7 +140,7 @@ class PluginSystem(object): imp.acquire_lock() try: moduleinfo = imp.find_module(m, self._path) - module = imp.load_module("."join(["FirstAidKit", "plugins", m]), *moduleinfo) + module = imp.load_module(".".join(["FirstAidKit", "plugins", m]), *moduleinfo) finally: imp.release_lock() |