diff options
| author | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2015-07-24 06:37:33 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2015-07-24 06:37:33 +0200 |
| commit | 68b5db49a54f59731ee52a966e0241c2ed0e5ba7 (patch) | |
| tree | b9b50d7b0454dc9919bbf319c40510b9b8215ba4 /src/lib/Bcfg2/Server/Lint | |
| parent | c11fcd8110e537db70bf40b91ed14467184b0e1c (diff) | |
| download | bcfg2-68b5db49a54f59731ee52a966e0241c2ed0e5ba7.tar.gz bcfg2-68b5db49a54f59731ee52a966e0241c2ed0e5ba7.tar.bz2 bcfg2-68b5db49a54f59731ee52a966e0241c2ed0e5ba7.zip | |
Utils: Generalize safe_module_name
Other plugins that also import user generated python source code, may want to use
safe_module_name from TemplateHelper.
Diffstat (limited to 'src/lib/Bcfg2/Server/Lint')
| -rw-r--r-- | src/lib/Bcfg2/Server/Lint/TemplateHelper.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Lint/TemplateHelper.py b/src/lib/Bcfg2/Server/Lint/TemplateHelper.py index 9d05516f1..ce6fdca74 100644 --- a/src/lib/Bcfg2/Server/Lint/TemplateHelper.py +++ b/src/lib/Bcfg2/Server/Lint/TemplateHelper.py @@ -4,8 +4,8 @@ import sys import imp from Bcfg2.Server.Lint import ServerPlugin -from Bcfg2.Server.Plugins.TemplateHelper import HelperModule, MODULE_RE, \ - safe_module_name +from Bcfg2.Server.Plugins.TemplateHelper import HelperModule, MODULE_RE +from Bcfg2.Utils import safe_module_name class TemplateHelper(ServerPlugin): @@ -44,7 +44,8 @@ class TemplateHelper(ServerPlugin): module_name = MODULE_RE.search(helper).group(1) try: - module = imp.load_source(safe_module_name(module_name), helper) + module = imp.load_source( + safe_module_name('TemplateHelper', module_name), helper) except: # pylint: disable=W0702 err = sys.exc_info()[1] self.LintError("templatehelper-import-error", |