remove country column

Author: pjamessteven

src/flask_track_usage/__init__.py

@@ -172,7 +172,6 @@ def after_request(self, response):
                 'X-Forwarded-For', None),
             'authorization': bool(ctx.request.authorization),
             'ip_info': None,
-            'country': None,
             'path': ctx.request.path,
             'speed': float(speed),
             'date': int(time.mktime(current_time.timetuple())),
@@ -195,9 +194,7 @@ def after_request(self, response):
         if self.ip_lookup_func:
             clean_ip = quote_plus(str(ctx.request.remote_addr))
             data['ip_info'] = self.ip_lookup_func(clean_ip)
-            country = data['ip_info'].get('country', None)
-            if country:
-                data['country'] = country
+
         elif self._use_freegeoip:
             clean_ip = quote_plus(str(ctx.request.remote_addr))
             if '{ip}' in self._freegeoip_endpoint:

src/flask_track_usage/storage/sql.py

@@ -113,7 +113,6 @@ def set_up(self, engine=None, metadata=None, table_name="flask_usage",
                     sql.Column('datetime', sql.DateTime),
                     sql.Column('username', sql.String(128)),
                     sql.Column('track_var', sql.String(128)),
-                    sql.Column('country', sql.String(64), nullable=True),
                 )
                 # Create the table if it does not exist
                 self.track_table.create(bind=self._eng)
@@ -160,7 +159,6 @@ def store(self, data):
                 datetime=utcdatetime,
                 username=data["username"],
                 track_var=json.dumps(data["track_var"], ensure_ascii=False),
-                country=data["country"],
             )
             con.execute(stmt)
         return data
@@ -200,7 +198,6 @@ def _get_usage(self, start_date=None, end_date=None, limit=500, page=1):
                 'date': r[15],
                 'username': r[16],
                 'track_var': r[17] if r[17] != '{}' else None,
-                'country': r[18]
             } for r in raw_data]
         return usage_data