equal
deleted
inserted
replaced
1326 else: |
1326 else: |
1327 # put entities first |
1327 # put entities first |
1328 appobjects.insert(0, appobjects.pop(index)) |
1328 appobjects.insert(0, appobjects.pop(index)) |
1329 return appobjects |
1329 return appobjects |
1330 |
1330 |
1331 def _appobjects_cube_modnames(self, cube): |
1331 def appobjects_cube_modnames(self, cube): |
1332 modnames = [] |
1332 modnames = [] |
1333 cube_submodnames = self._sorted_appobjects(self.cube_appobject_path) |
1333 cube_submodnames = self._sorted_appobjects(self.cube_appobject_path) |
1334 for name in cube_submodnames: |
1334 for name in cube_submodnames: |
1335 for modname, filepath in _expand_modname('.'.join(['cubes', cube, name])): |
1335 for modname, filepath in _expand_modname('.'.join(['cubes', cube, name])): |
1336 modnames.append(modname) |
1336 modnames.append(modname) |
1340 modnames = [] |
1340 modnames = [] |
1341 for name in self._sorted_appobjects(self.cubicweb_appobject_path): |
1341 for name in self._sorted_appobjects(self.cubicweb_appobject_path): |
1342 for modname, filepath in _expand_modname('cubicweb.' + name): |
1342 for modname, filepath in _expand_modname('cubicweb.' + name): |
1343 modnames.append(modname) |
1343 modnames.append(modname) |
1344 for cube in reversed(self.cubes()): |
1344 for cube in reversed(self.cubes()): |
1345 modnames.extend(self._appobjects_cube_modnames(cube)) |
1345 modnames.extend(self.appobjects_cube_modnames(cube)) |
1346 if self.apphome: |
1346 if self.apphome: |
1347 cube_submodnames = self._sorted_appobjects(self.cube_appobject_path) |
1347 cube_submodnames = self._sorted_appobjects(self.cube_appobject_path) |
1348 apphome = realpath(self.apphome) |
1348 apphome = realpath(self.apphome) |
1349 for name in cube_submodnames: |
1349 for name in cube_submodnames: |
1350 for modname, filepath in _expand_modname(name): |
1350 for modname, filepath in _expand_modname(name): |