equal
deleted
inserted
replaced
275 |
275 |
276 def tearDown(self): |
276 def tearDown(self): |
277 undo_monkey_patch() |
277 undo_monkey_patch() |
278 |
278 |
279 def _prepare_plan(self, cnx, rql, kwargs=None): |
279 def _prepare_plan(self, cnx, rql, kwargs=None): |
280 rqlst = self.o.parse(rql, annotate=True) |
280 rqlst = self.repo.vreg.rqlhelper.parse(rql, annotate=True) |
281 self.o.solutions(cnx, rqlst, kwargs) |
281 self.repo.vreg.solutions(cnx, rqlst, kwargs) |
282 if rqlst.TYPE == 'select': |
282 if rqlst.TYPE == 'select': |
283 self.repo.vreg.rqlhelper.annotate(rqlst) |
283 self.repo.vreg.rqlhelper.annotate(rqlst) |
284 for select in rqlst.children: |
284 for select in rqlst.children: |
285 select.solutions.sort(key=lambda x: list(x.items())) |
285 select.solutions.sort(key=lambda x: list(x.items())) |
286 else: |
286 else: |