nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use imp instead of __import__

Browse source
This commit is contained in:
Romain Bignon 2012-05-07 14:02:45 +02:00
commit ba1879d501
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
weboob/core/modules.py
View file

@ -18,7 +18,6 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>. # along with weboob. If not, see <http://www.gnu.org/licenses/>.
import imp import imp
import sys
import logging import logging
from weboob.tools.backend import BaseBackend from weboob.tools.backend import BaseBackend

12
weboob/core/repositories.py
View file

@ -19,6 +19,7 @@
from __future__ import with_statement from __future__ import with_statement
import imp
import tarfile import tarfile
import posixpath import posixpath
import shutil import shutil
@ -280,16 +281,20 @@ class Repository(object):
self.signed = False self.signed = False
self.key_update = 0 self.key_update = 0
sys.path.append(path)
for name in sorted(os.listdir(path)): for name in sorted(os.listdir(path)):
module_path = os.path.join(path, name) module_path = os.path.join(path, name)
if not os.path.isdir(module_path) or '.' in name or name == self.KEYDIR: if not os.path.isdir(module_path) or '.' in name or name == self.KEYDIR:
continue continue
try: try:
module = Module(__import__(name, fromlist=[str(name)])) fp, pathname, description = imp.find_module(name, [path])
try:
module = Module(imp.load_module(name, fp, pathname, description))
finally:
if fp:
fp.close()
except Exception, e: except Exception, e:
print >>sys.stderr, 'Unable to build module %s: [%s] %s' % (name, type(e), e) print >>sys.stderr, 'Unable to build module %s: [%s] %s' % (name, type(e).__name__, e)
else: else:
m = ModuleInfo(module.name) m = ModuleInfo(module.name)
m.version = self.get_tree_mtime(module_path) m.version = self.get_tree_mtime(module_path)
@ -299,7 +304,6 @@ class Repository(object):
m.license = module.license m.license = module.license
m.icon = module.icon or '' m.icon = module.icon or ''
self.modules[module.name] = m self.modules[module.name] = m
sys.path.remove(path)
self.update = int(datetime.now().strftime('%Y%m%d%H%M')) self.update = int(datetime.now().strftime('%Y%m%d%H%M'))
self.save(filename) self.save(filename)