on master help sign in
[enh] engine shortcut validation
commit2e41bfcbdbb762be610ff379380ea2201f544edd authorAdam Tauber <asciimoo@gmail.com> dateSat 20 Dec 2014, 12:17 (12 years ago) parent7eb2784
1 file changed+6−1
searx/engines/__init__.py+6−1
searx/engines/__init__.py+6−1
@@ -81,7 +81,8 @@ def load_engine(engine_data):
8181 if engine_attr.startswith('_'):
8282 continue
8383 if getattr(engine, engine_attr) is None:
84− print '[E] Engine config error: Missing attribute "{0}.{1}"'.format(engine.name, engine_attr) # noqa
84+ print('[E] Engine config error: Missing attribute "{0}.{1}"'\
85+ .format(engine.name, engine_attr))
8586 sys.exit(1)
8687
8788 engine.stats = {
@@ -100,6 +101,10 @@ def load_engine(engine_data):
100101
101102 if engine.shortcut:
102103 # TODO check duplications
104+ if engine.shortcut in engine_shortcuts:
105+ print('[E] Engine config error: ambigious shortcut: {0}'\
106+ .format(engine.shortcut))
107+ sys.exit(1)
103108 engine_shortcuts[engine.shortcut] = engine.name
104109 return engine
105110