Return "Anonymous Player" for tracked players who hide their name

diff --git a/xonstat/models.py b/xonstat/models.py
index 517536ab93ca7e8f9219b5bf5a19658f0c819b27..2ed0f6ee851f535f6c9288c3307180d77d241104 100755 (executable)
--- a/xonstat/models.py
+++ b/xonstat/models.py
@@ -12,10 +12,16 @@ Base = declarative_base()
 class Player(object):
 
     def nick_html_colors(self):
-        return html_colors(self.nick)
+        if self.nick is None:
+            return "Anonymous Player"
+        else:
+            return html_colors(self.nick)
 
     def nick_strip_colors(self):
-        return strip_colors(self.nick)
+        if self.nick is None:
+            return "Anonymous Player"
+        else:
+            return strip_colors(self.nick)
 
     def __repr__(self):
         return "<Player(%s, %s, %s, %s)>" % (self.player_id, self.nick, 

diff --git a/xonstat/util.py b/xonstat/util.py
index e9d179a933f53670321aa0e15ca4d1b89933c273..4ef6c8097bb72da72759da1da034ce93fd7cafe1 100755 (executable)
--- a/xonstat/util.py
+++ b/xonstat/util.py
@@ -1,13 +1,19 @@
 import re
 from datetime import datetime
 
-def strip_colors(str=None):
+def strip_colors(str=''):
+    if str is None:
+        str = ''
+
     str = re.sub(r'\^x\w\w\w', '', str)
     str = re.sub(r'\^\d', '', str)
     return str
 
 
-def html_colors(str=None):
+def html_colors(str=''):
+    if str is None:
+        str = ''
+
     orig = str
     str = re.sub(r'\^x(\w)(\w)(\w)', 
             "<span style='color:#\g<1>\g<1>\g<2>\g<2>\g<3>\g<3>'>", str)