Bläddra i källkod

[enh] engine shortcut validation

Adam Tauber 10 år sedan
förälder
incheckning
2e41bfcbdb
1 ändrade filer med 6 tillägg och 1 borttagningar
  1. 6
    1
      searx/engines/__init__.py

+ 6
- 1
searx/engines/__init__.py Visa fil

@@ -81,7 +81,8 @@ def load_engine(engine_data):
81 81
         if engine_attr.startswith('_'):
82 82
             continue
83 83
         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))
85 86
             sys.exit(1)
86 87
 
87 88
     engine.stats = {
@@ -100,6 +101,10 @@ def load_engine(engine_data):
100 101
 
101 102
     if engine.shortcut:
102 103
         # 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)
103 108
         engine_shortcuts[engine.shortcut] = engine.name
104 109
     return engine
105 110