From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: location@lists.ipfire.org Subject: [PATCH] location-importer.in: track original countries more pythonic Date: Wed, 02 Jun 2021 23:00:22 +0200 Message-ID: <5c46c7bb-4c42-4b8f-28b6-948c7f5641e8@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7992502696181679713==" List-Id: --===============7992502696181679713== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit https://lists.ipfire.org/pipermail/location/2021-May/000377.html Reported-by: Michael Tremer Signed-off-by: Peter Müller --- src/python/location-importer.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/python/location-importer.in b/src/python/location-importer.in index a3c16bc..3e1f859 100644 --- a/src/python/location-importer.in +++ b/src/python/location-importer.in @@ -628,15 +628,17 @@ class CLI(object): inetnum[key] = [ipaddress.ip_network(val, strict=False)] elif key == "country": + val = val.upper() + # Catch RIR data objects with more than one country code... - if not key in inetnum.keys(): + if not key in inetnum: inetnum[key] = [] else: - if val.upper() in inetnum.get("country"): + if val in inetnum.get("country"): # ... but keep this list distinct... continue - inetnum[key].append(val.upper()) + inetnum[key].append(val) # Skip empty objects if not inetnum or not "country" in inetnum: -- 2.26.2 --===============7992502696181679713==--