equal
deleted
inserted
replaced
26 |
26 |
27 from logging import getLogger |
27 from logging import getLogger |
28 from time import time, clock |
28 from time import time, clock |
29 from itertools import count |
29 from itertools import count |
30 from warnings import warn |
30 from warnings import warn |
|
31 from os.path import join |
31 |
32 |
32 from logilab.common.logging_ext import set_log_methods |
33 from logilab.common.logging_ext import set_log_methods |
33 from logilab.common.decorators import monkeypatch |
34 from logilab.common.decorators import monkeypatch |
34 from logilab.common.deprecation import deprecated |
35 from logilab.common.deprecation import deprecated |
35 |
36 |
548 else: |
549 else: |
549 esubpath = subpath |
550 esubpath = subpath |
550 if 'views' in subpath: |
551 if 'views' in subpath: |
551 esubpath = list(subpath) |
552 esubpath = list(subpath) |
552 esubpath.remove('views') |
553 esubpath.remove('views') |
553 esubpath.append('web/views') |
554 esubpath.append(join('web', 'views')) |
554 cubes = reversed([config.cube_dir(p) for p in cubes]) |
555 cubes = reversed([config.cube_dir(p) for p in cubes]) |
555 vpath = config.build_vregistry_path(cubes, evobjpath=esubpath, |
556 vpath = config.build_vregistry_path(cubes, evobjpath=esubpath, |
556 tvobjpath=subpath) |
557 tvobjpath=subpath) |
557 self.vreg.register_objects(vpath, force_reload) |
558 self.vreg.register_objects(vpath, force_reload) |
558 if self._cnxtype == 'inmemory': |
559 if self._cnxtype == 'inmemory': |