Merge branch 'master' into singularity

2015-05-27 14:55:12 +03:00
parent 26122f6da7 e81f7eb765
commit ef6e25bfce
1 changed files with 1 additions and 1 deletions
--- a/eos/saveddata/character.py
+++ b/eos/saveddata/character.py
@@ -192,7 +192,7 @@ class Character(object):
        map = {"ID": lambda val: isinstance(val, int),
               "name" : lambda val: True,
               "apiKey" : lambda val: val is None or (isinstance(val, basestring) and len(val) > 0),
-               "ownerID" : lambda val: isinstance(val, int)}
+               "ownerID" : lambda val: isinstance(val, int) or val is None}

        if map[key](val) == False: raise ValueError(str(val) + " is not a valid value for " + key)
        else: return val