diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 998c21c50c..72e39e5651 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -229,9 +229,6 @@ class ResultCache(SearchQueryParser): # {{{ def __init__(self, FIELD_MAP, field_metadata, db_prefs=None): self.FIELD_MAP = FIELD_MAP l = get_lang() - asciize_author_names = l and l.lower() in ('en', 'eng') - if not asciize_author_names: - self.ascii_name = lambda x: False self.db_prefs = db_prefs self.composites = {} self.udc = get_udc() @@ -281,15 +278,6 @@ class ResultCache(SearchQueryParser): # {{{ # Search functions {{{ - def ascii_name(self, name): - try: - ans = self.udc.decode(name) - if ans == name: - ans = False - except: - ans = False - return ans - def universal_set(self): return set([i[0] for i in self._data if i is not None]) @@ -807,9 +795,6 @@ class ResultCache(SearchQueryParser): # {{{ if loc not in exclude_fields: # time for text matching if is_multiple_cols[loc] is not None: vals = [v.strip() for v in item[loc].split(is_multiple_cols[loc])] - if loc == au_loc: - vals += filter(None, map(self.ascii_name, - vals)) else: vals = [item[loc]] ### make into list to make _match happy if _match(q, vals, matchkind):