From: Ant Zucaro <azucaro@gmail.com>
Date: Thu, 19 Jan 2012 01:46:43 +0000 (-0500)
Subject: Fix bad namespace which breaks search.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c7ef817f08277413c8f8a089ed2a3dbb91989545;p=xonotic%2Fxonstat.git

Fix bad namespace which breaks search.
---

diff --git a/xonstat/models.py b/xonstat/models.py
index 9925fc7..50d0a35 100755
--- a/xonstat/models.py
+++ b/xonstat/models.py
@@ -1,7 +1,7 @@
 import logging
 import math
 import sqlalchemy
-import sqlalchemy.sql.functions as func
+import sqlalchemy.sql.functions as sfunc
 from datetime import timedelta
 from sqlalchemy.orm import mapper
 from sqlalchemy.orm import scoped_session
@@ -91,7 +91,7 @@ class Game(object):
         # we do not have the actual duration of the game, so use the 
         # maximum alivetime of the players instead
         duration = 0
-        for d in session.query(func.max(PlayerGameStat.alivetime)).\
+        for d in session.query(sfunc.max(PlayerGameStat.alivetime)).\
                     filter(PlayerGameStat.game_id==self.game_id).\
                     one():
             duration = d.seconds
diff --git a/xonstat/views/search.py b/xonstat/views/search.py
index 330a502..6f40984 100755
--- a/xonstat/views/search.py
+++ b/xonstat/views/search.py
@@ -6,7 +6,7 @@ import time
 from pyramid.response import Response
 from sqlalchemy import desc
 from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound
-from sqlalchemy.sql import func
+from sqlalchemy import func
 from xonstat.models import *
 from xonstat.util import strip_colors, qfont_decode
 from xonstat.util import page_url, html_colors