Browse Source

[enh] engine shortcut validation

Adam Tauber 10 years ago
parent
commit
2e41bfcbdb
1 changed files with 6 additions and 1 deletions
  1. 6 1
      searx/engines/__init__.py

+ 6 - 1
searx/engines/__init__.py

@@ -81,7 +81,8 @@ def load_engine(engine_data):
         if engine_attr.startswith('_'):
             continue
         if getattr(engine, engine_attr) is None:
-            print '[E] Engine config error: Missing attribute "{0}.{1}"'.format(engine.name, engine_attr)  # noqa
+            print('[E] Engine config error: Missing attribute "{0}.{1}"'\
+                  .format(engine.name, engine_attr))
             sys.exit(1)
 
     engine.stats = {
@@ -100,6 +101,10 @@ def load_engine(engine_data):
 
     if engine.shortcut:
         # TODO check duplications
+        if engine.shortcut in engine_shortcuts:
+            print('[E] Engine config error: ambigious shortcut: {0}'\
+                  .format(engine.shortcut))
+            sys.exit(1)
         engine_shortcuts[engine.shortcut] = engine.name
     return engine