Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix search parsing broken on windows, though I have no idea why it broke

Browse Source
This commit is contained in:
Kovid Goyal 2011-04-21 09:31:19 -06:00
parent 1e2782c613
commit e910505e4e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/utils/search_query_parser.py
View File

@ -16,14 +16,14 @@ methods :method:`SearchQueryParser.universal_set` and
If this module is run, it will perform a series of unit tests. If this module is run, it will perform a series of unit tests.
''' '''
import sys, string, operator import sys, operator
from calibre.utils.pyparsing import CaselessKeyword, Group, Forward, \ from calibre.utils.pyparsing import CaselessKeyword, Group, Forward, \
CharsNotIn, Suppress, OneOrMore, MatchFirst, CaselessLiteral, \ CharsNotIn, Suppress, OneOrMore, MatchFirst, CaselessLiteral, \
Optional, NoMatch, ParseException, QuotedString Optional, NoMatch, ParseException, QuotedString
from calibre.constants import preferred_encoding from calibre.constants import preferred_encoding
from calibre.utils.icu import sort_key from calibre.utils.icu import sort_key
from calibre import prints
''' '''
@ -109,7 +109,7 @@ class SearchQueryParser(object):
def run_tests(parser, result, tests): def run_tests(parser, result, tests):
failed = [] failed = []
for test in tests: for test in tests:
print '\tTesting:', test[0], prints('\tTesting:', test[0], end=' ')
res = parser.parseString(test[0]) res = parser.parseString(test[0])
if list(res.get(result, None)) == test[1]: if list(res.get(result, None)) == test[1]:
print 'OK' print 'OK'
@ -134,7 +134,7 @@ class SearchQueryParser(object):
for l in standard_locations: for l in standard_locations:
location |= l location |= l
location = Optional(location, default='all') location = Optional(location, default='all')
word_query = CharsNotIn(string.whitespace + '()') word_query = CharsNotIn(u'\t\r\n\u00a0 ' + u'()')
#quoted_query = Suppress('"')+CharsNotIn('"')+Suppress('"') #quoted_query = Suppress('"')+CharsNotIn('"')+Suppress('"')
quoted_query = QuotedString('"', escChar='\\') quoted_query = QuotedString('"', escChar='\\')
query = quoted_query | word_query query = quoted_query | word_query
@ -617,7 +617,7 @@ class Tester(SearchQueryParser):
def run_tests(self): def run_tests(self):
failed = [] failed = []
for query in self.tests.keys(): for query in self.tests.keys():
print 'Testing query:', query, prints('Testing query:', query, end=' ')
res = self.parse(query) res = self.parse(query)
if res != self.tests[query]: if res != self.tests[query]:
print 'FAILED', 'Expected:', self.tests[query], 'Got:', res print 'FAILED', 'Expected:', self.tests[query], 'Got:', res