623 validator = validatorclass() |
623 validator = validatorclass() |
624 return validator.parse_string(output.strip()) |
624 return validator.parse_string(output.strip()) |
625 |
625 |
626 # deprecated ############################################################### |
626 # deprecated ############################################################### |
627 |
627 |
628 @deprecated('use self.vreg["etypes"].etype_class(etype)(self.request())') |
628 @deprecated('[3.4] use self.vreg["etypes"].etype_class(etype)(self.request())') |
629 def etype_instance(self, etype, req=None): |
629 def etype_instance(self, etype, req=None): |
630 req = req or self.request() |
630 req = req or self.request() |
631 e = self.vreg['etypes'].etype_class(etype)(req) |
631 e = self.vreg['etypes'].etype_class(etype)(req) |
632 e.eid = None |
632 e.eid = None |
633 return e |
633 return e |
634 |
634 |
635 @nocoverage |
635 @nocoverage |
636 @deprecated('use req = self.request(); rset = req.execute()') |
636 @deprecated('[3.4] use req = self.request(); rset = req.execute()') |
637 def rset_and_req(self, rql, optional_args=None, args=None, eidkey=None): |
637 def rset_and_req(self, rql, optional_args=None, args=None, eidkey=None): |
638 """executes <rql>, builds a resultset, and returns a |
638 """executes <rql>, builds a resultset, and returns a |
639 couple (rset, req) where req is a FakeRequest |
639 couple (rset, req) where req is a FakeRequest |
640 """ |
640 """ |
641 return (self.execute(rql, args, eidkey), |
641 return (self.execute(rql, args, eidkey), |