From c89084cedb645616a5da2df8133f7e18eb66dba6 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 29 Sep 2015 00:26:16 +0200 Subject: [PATCH] Revert "geoip: Tolerate lots of spaces in database fields" This reverts commit f28bd37a953eb51dd7a9e5ae6524f651b3f0757a. --- webapp/backend/geoip.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/webapp/backend/geoip.py b/webapp/backend/geoip.py index 16159a58..9a3650f0 100644 --- a/webapp/backend/geoip.py +++ b/webapp/backend/geoip.py @@ -24,16 +24,7 @@ class GeoIP(Object): query = "SELECT * FROM geoip \ WHERE %s BETWEEN start_ip AND end_ip LIMIT 1" - ret = self.db.get(query, addr) - - if ret: - if ret.city: - ret.city = ret.city.strip() - - if ret.postal_code: - ret.postal_code = ret.postal_code.strip() - - return ret + return self.db.get(query, addr) def get_asn(self, addr): query = "SELECT asn FROM geoip_asn \ -- 2.39.2