equal
deleted
inserted
replaced
36 import itertools |
36 import itertools |
37 import zipfile |
37 import zipfile |
38 import logging |
38 import logging |
39 import sys |
39 import sys |
40 |
40 |
|
41 from six import string_types |
41 from six.moves import range, cPickle as pickle |
42 from six.moves import range, cPickle as pickle |
42 |
43 |
43 from logilab.common.decorators import cached, clear_cache |
44 from logilab.common.decorators import cached, clear_cache |
44 from logilab.common.configuration import Method |
45 from logilab.common.configuration import Method |
45 from logilab.common.shellutils import getlogin |
46 from logilab.common.shellutils import getlogin |
556 except KeyError: |
557 except KeyError: |
557 self.cache_miss += 1 |
558 self.cache_miss += 1 |
558 sql, qargs, cbs = self._rql_sqlgen.generate(union, args, varmap) |
559 sql, qargs, cbs = self._rql_sqlgen.generate(union, args, varmap) |
559 self._cache[cachekey] = sql, qargs, cbs |
560 self._cache[cachekey] = sql, qargs, cbs |
560 args = self.merge_args(args, qargs) |
561 args = self.merge_args(args, qargs) |
561 assert isinstance(sql, basestring), repr(sql) |
562 assert isinstance(sql, string_types), repr(sql) |
562 cursor = self.doexec(cnx, sql, args) |
563 cursor = self.doexec(cnx, sql, args) |
563 results = self.process_result(cursor, cnx, cbs) |
564 results = self.process_result(cursor, cnx, cbs) |
564 assert dbg_results(results) |
565 assert dbg_results(results) |
565 return results |
566 return results |
566 |
567 |