equal
deleted
inserted
replaced
20 |
20 |
21 |
21 |
22 |
22 |
23 import re |
23 import re |
24 from logging import getLogger |
24 from logging import getLogger |
25 |
|
26 from six import text_type |
|
27 |
25 |
28 from yams.interfaces import IVocabularyConstraint |
26 from yams.interfaces import IVocabularyConstraint |
29 |
27 |
30 from rql import RQLSyntaxError, BadRQLQuery, parse |
28 from rql import RQLSyntaxError, BadRQLQuery, parse |
31 from rql.utils import rqlvar_maker |
29 from rql.utils import rqlvar_maker |
386 assert not processor.name in self.by_name |
384 assert not processor.name in self.by_name |
387 self.by_name[processor.name.lower()] = processor |
385 self.by_name[processor.name.lower()] = processor |
388 self.processors = sorted(processors, key=lambda x: x.priority) |
386 self.processors = sorted(processors, key=lambda x: x.priority) |
389 |
387 |
390 def process_query(self, uquery): |
388 def process_query(self, uquery): |
391 assert isinstance(uquery, text_type) |
389 assert isinstance(uquery, str) |
392 try: |
390 try: |
393 procname, query = uquery.split(':', 1) |
391 procname, query = uquery.split(':', 1) |
394 proc = self.by_name[procname.strip().lower()] |
392 proc = self.by_name[procname.strip().lower()] |
395 uquery = query.strip() |
393 uquery = query.strip() |
396 except Exception: |
394 except Exception: |