From de1b80fa4d3f74c21ae10f2c59ae7a24b064c206 Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Wed, 12 Dec 2012 23:27:03 +0100 Subject: [PATCH] Fix .zip file module loading. --- dosagelib/loader.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dosagelib/loader.py b/dosagelib/loader.py index a50632f3c..e27d54957 100644 --- a/dosagelib/loader.py +++ b/dosagelib/loader.py @@ -24,10 +24,10 @@ def get_modules(folder='plugins'): # find modules in library.zip filename zipname = os.path.dirname(os.path.dirname(__file__)) with zipfile.ZipFile(zipname, 'r') as f: - modnames = [os.path.splitext(n[17:])[0] + prefix = "dosagelib/%s/" % folder + modnames = [os.path.splitext(n[len(prefix):])[0] for n in f.namelist() - if n.startswith("dosagelib/%s" % folder) - and "__init__" not in n] + if n.startswith(prefix) and "__init__" not in n] else: dirname = os.path.join(os.path.dirname(__file__), folder) modnames = get_importable_modules(dirname)