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

WebNip tries to find path to package weboob_modules

Browse source
This commit is contained in:
Romain Bignon 2013-08-18 17:04:13 +02:00
commit e2476bfb0e
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
weboob/core/ouiboube.py
View file

@ -18,8 +18,8 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>. # along with weboob. If not, see <http://www.gnu.org/licenses/>.
import pkg_resources
import os import os
import shutil
from weboob.core.bcall import BackendsCall from weboob.core.bcall import BackendsCall
from weboob.core.modules import ModulesLoader, RepositoryModulesLoader, ModuleLoadError from weboob.core.modules import ModulesLoader, RepositoryModulesLoader, ModuleLoadError
@ -61,7 +61,10 @@ class WebNip(object):
'captcha': lambda backend_name, image: None, 'captcha': lambda backend_name, image: None,
} }
if modules_path is not None: if modules_path is None:
modules_path = pkg_resources.resource_filename('weboob_modules', '')
if modules_path:
self.modules_loader = ModulesLoader(modules_path, self.VERSION) self.modules_loader = ModulesLoader(modules_path, self.VERSION)
if scheduler is None: if scheduler is None:
@ -314,7 +317,7 @@ class Weboob(WebNip):
BACKENDS_FILENAME = 'backends' BACKENDS_FILENAME = 'backends'
def __init__(self, workdir=None, backends_filename=None, scheduler=None, storage=None): def __init__(self, workdir=None, backends_filename=None, scheduler=None, storage=None):
super(Weboob, self).__init__(scheduler=scheduler, storage=storage) super(Weboob, self).__init__(modules_path=False, scheduler=scheduler, storage=storage)
# Create WORKDIR # Create WORKDIR
if workdir is not None: if workdir is not None: