Hirad/pylast
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

* Further Error-proofing through pylast.NetworkError.

Browse source
This commit is contained in:
Amr Hassan 2011-01-21 22:33:34 +00:00
parent 881d6abf3e
commit b267c90b82
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pylast.py
View file

@ -781,11 +781,20 @@ class _Request(object):
if self.network.is_proxy_enabled(): if self.network.is_proxy_enabled():
conn = HTTPConnection(host = self._get_proxy()[0], port = self._get_proxy()[1]) conn = HTTPConnection(host = self._get_proxy()[0], port = self._get_proxy()[1])
try:
conn.request(method='POST', url="http://" + HOST_NAME + HOST_SUBDIR, conn.request(method='POST', url="http://" + HOST_NAME + HOST_SUBDIR,
body=data, headers=headers) body=data, headers=headers)
except Exception as e:
raise NetworkError(self.network, e)
else: else:
conn = HTTPConnection(host=HOST_NAME) conn = HTTPConnection(host=HOST_NAME)
try:
conn.request(method='POST', url=HOST_SUBDIR, body=data, headers=headers) conn.request(method='POST', url=HOST_SUBDIR, body=data, headers=headers)
except Exception as e:
raise NetworkError(self.network, e)
try: try:
response_text = _unicode(conn.getresponse().read()) response_text = _unicode(conn.getresponse().read())
@ -1112,6 +1121,16 @@ class MalformedResponseError(Exception):
def __str__(self): def __str__(self):
return "Malformed response from Last.fm. Underlying error: %s" %str(self.underlying_error) return "Malformed response from Last.fm. Underlying error: %s" %str(self.underlying_error)
class NetworkError(Exception):
"""Exception conveying a problem in sending a request to Last.fm"""
def __init__(self, network, underlying_error):
self.network = network
self.underlying_error = underlying_error
def __str__(self):
return "NetworkError: %s" %str(self.underlying_error)
class Album(_BaseObject, _Taggable): class Album(_BaseObject, _Taggable):
"""An album.""" """An album."""