Fix merge conflict.

[xonotic/xonstat.git] / xonstat / models / main.py

diff --git a/xonstat/models/main.py b/xonstat/models/main.py
index 4f2ab22119cd5ceeed387014c37d01eda76b3f2b..6eec9ac1254665ca06f0282bd93441603cc5d1b3 100644 (file)
--- a/xonstat/models/main.py
+++ b/xonstat/models/main.py
@@ -1,14 +1,26 @@
+"""
+Models related to the main index page.
+"""
+
 from xonstat.util import html_colors
 
 
 class SummaryStat(object):
+    """
+    The high level summary line that is shown on the main page.
+    """
+
     def __repr__(self):
-        return "<SummaryStat(total_players=%s, total_games=%s, total_servers=%s)>" % (self.total_players, self.total_games, self.total_servers)
+        return ("<SummaryStat(total_players={0.total_players}, total_games={0.total_games}, "
+                "total_servers={0.total_servers})>".format(self))
 
 
 class ActivePlayer(object):
-    def __init__(self, sort_order=None, player_id=None, nick=None,
-            alivetime=None):
+    """
+    A record in the "Most Active Players" list.
+    """
+
+    def __init__(self, sort_order=None, player_id=None, nick=None, alivetime=None):
         self.sort_order = sort_order
         self.player_id = player_id
         self.nick = nick
@@ -18,28 +30,34 @@ class ActivePlayer(object):
         return html_colors(self.nick)
 
     def __repr__(self):
-        return "<ActivePlayer(%s, %s)>" % (self.sort_order, self.player_id)
+        return "<ActivePlayer({0.sort_order}, {0.player_id})>".format(self)
 
 
 class ActiveServer(object):
-    def __init__(self, sort_order=None, server_id=None, server_name=None,
-            games=None):
+    """
+    A record in the "Most Active Servers" list.
+    """
+
+    def __init__(self, sort_order=None, server_id=None, server_name=None, games=None):
         self.sort_order = sort_order
         self.server_id = server_id
         self.server_name = server_name
         self.games = games
 
     def __repr__(self):
-        return "<ActiveServer(%s, %s)>" % (self.sort_order, self.server_id)
+        return "<ActiveServer({0.sort_order}, {0.server_id})>".format(self)
 
 
 class ActiveMap(object):
-    def __init__(self, sort_order=None, map_id=None, map_name=None,
-            games=None):
+    """
+    A record in the "Most Active Maps" list.
+    """
+
+    def __init__(self, sort_order=None, map_id=None, map_name=None, games=None):
         self.sort_order = sort_order
         self.map_id = map_id
         self.map_name = map_name
         self.games = games
 
     def __repr__(self):
-        return "<ActiveMap(%s, %s)>" % (self.sort_order, self.map_id)
\ No newline at end of file
+        return "<ActiveMap({0.sort_order}, {0.map_id})>".format(self)