Merge branch 'sev/xolonium4-badges' into 'master'

[xonotic/xonstat.git] / xonstat / batch / badges / gen_badges.py

diff --git a/xonstat/batch/badges/gen_badges.py b/xonstat/batch/badges/gen_badges.py
index 6bd8bc2b2e200b95824e38ea3dae5e1f27637813..f9d97d6e8a5bd76e64171cd46bebb227bc677225 100644 (file)
--- a/xonstat/batch/badges/gen_badges.py
+++ b/xonstat/batch/badges/gen_badges.py
@@ -1,17 +1,14 @@
 #-*- coding: utf-8 -*-
 
 import sys
-from datetime import datetime
-import sqlalchemy as sa
-import sqlalchemy.sql.functions as func
-from sqlalchemy import distinct
-from pyramid.paster import bootstrap
-from xonstat.models import *
-from xonstat.util import datetime_seconds
+from datetime import datetime, timedelta
 
-from skin import Skin
 from playerdata import PlayerData
-
+from pyramid.paster import bootstrap
+from skin import Skin
+from sqlalchemy import distinct
+from xonstat.models import DBSession, PlayerGameStat, Player, PlayerElo
+from xonstat.util import datetime_seconds
 
 # maximal number of query results (for testing, set to None to get all)
 NUM_PLAYERS = None