Ensure that country codes are uppercase and fix some bugs in the ARIN database

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/tools/base.py b/tools/base.py
index f2b4bbeac8c46422722026f3a555ec52771c6dd0..7cfea8cd4e895283f3711ab1b4e8a904cb9f7b3c 100644 (file)
--- a/tools/base.py
+++ b/tools/base.py
@@ -278,9 +278,15 @@ class RIRParser(object):
 
                                inetnum[key] = val
                        
-                       elif key in ("netname", "country"):
+                       elif key == "netname":
                                inetnum[key] = val
 
+                       elif key == "country":
+                               if val == "UNITED STATES":
+                                       val = "US"
+
+                               inetnum[key] = val.upper()
+
                        elif key == "descr":
                                if key in inetnum:
                                        inetnum[key] += "\n%s" % val