Merge branch 'master' into test-3

# Conflicts: # .gitignore # eos/saveddata/character.py # service/network.py # service/price.py
2017-12-10 22:30:48 -05:00
parent 2936b88c3d a8060a5e15
commit 40ce7b7c0b
89 changed files with 345 additions and 156 deletions
--- a/service/network.py
+++ b/service/network.py
@@ -126,6 +126,7 @@ class Network(object):
                raise AuthenticationError()
            elif error.code >= 500:
                raise ServerError()
+            raise Error(error)
        except urllib.error.URLError as error:
            pyfalog.warning("Timed out or other URL error:")
            pyfalog.warning(error)