@@ -88,18 +88,16 @@ class Query(object):
88 prefix = query_part[1:].replace('_', ' ')
88 prefix = query_part[1:].replace('_', ' ')
90 # check if prefix is equal with engine shortcut
90 # check if prefix is equal with engine shortcut
91− if prefix in engine_shortcuts\
91+ if prefix in engine_shortcuts:
92− and not engine_shortcuts[prefix] in self.blocked_engines:
93 parse_next = True
92 parse_next = True
94 self.engines.append({'category': 'none',
93 self.engines.append({'category': 'none',
95 'name': engine_shortcuts[prefix]})
94 'name': engine_shortcuts[prefix]})
97 # check if prefix is equal with engine name
96 # check if prefix is equal with engine name
98− elif prefix in engines\
97+ elif prefix in engines:
99− and prefix not in self.blocked_engines:
100 parse_next = True
98 parse_next = True
101 self.engines.append({'category': 'none',
99 self.engines.append({'category': 'none',
102− 'name': prefix})
100+ 'name': prefix})
104 # check if prefix is equal with categorie name
102 # check if prefix is equal with categorie name
105 elif prefix in categories:
103 elif prefix in categories:
@@ -107,7 +105,7 @@ class Query(object):
107 # are declared under that categorie name
105 # are declared under that categorie name
108 parse_next = True
106 parse_next = True
109 self.engines.extend({'category': prefix,
107 self.engines.extend({'category': prefix,
110− 'name': engine.name}
108+ 'name': engine.name}
111 for engine in categories[prefix]
109 for engine in categories[prefix]
112 if engine not in self.blocked_engines)
110 if engine not in self.blocked_engines)