web: fix invalid country codes being passed
authorJohannes Berg <johannes@sipsolutions.net>
Fri, 23 May 2008 12:51:07 +0000 (14:51 +0200)
committerJohannes Berg <johannes@sipsolutions.net>
Fri, 23 May 2008 12:51:07 +0000 (14:51 +0200)
web/Regulatory.py

index 1c46b8f..d17a862 100644 (file)
@@ -136,7 +136,10 @@ def macro_Regulatory(macro):
     bpc = DBParser().parse(open(dbpath))
 
     if country:
-        return _country(macro, bpc, country)
+        try:
+            return _country(macro, bpc, country)
+        except KeyError:
+            return f.text('No such country code')
 
     band, power, country = bpc
     countries = country.keys()