Merge branch 'master' into dispatcher-rework

Conflicts:
	README.rst
This commit is contained in:
Jannes Höke 2016-04-17 12:45:31 +02:00
commit ad211655ea

View file

@ -106,6 +106,9 @@ def _try_except_req(func):
except HTTPException as error:
raise NetworkError('HTTPException: {0!r}'.format(error))
except socket.error as error:
raise NetworkError('socket.error: {0!r}'.format(error))
return decorator