aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--layman/module.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/layman/module.py b/layman/module.py
index 08bcbc2..092418f 100644
--- a/layman/module.py
+++ b/layman/module.py
@@ -49,13 +49,14 @@ class Module(object):
kid = self.module_spec['provides'][submodule]
kidname = kid['name']
try:
+ kid['module_name'] = '.'.join([mod_name, kid['sourcefile']])
+ except KeyError:
kid['module_name'] = '.'.join([mod_name, kidname])
- except ImportError:
- kid['module_name'] = '.'.join([mod_name, self.name])
- f = self.__module.__file__
- msg = 'Module.__initialize(); module spec is old, missing '\
+ f = self._module.__file__
+ msg = 'Module.__initialize(); %(module)s module spec is old, missing '\
'attribute: \'sourcefile\'.\nBackward compatibility '\
- 'may be removed in the future.\nFile: %(f)s' % {'f': f}
+ 'may be removed in the future.\nFile: %(f)s' % {
+ 'module': self.name, 'f': f}
self.output.warn(msg)
kid['is_imported'] = False
self.kids[kidname] = kid