Merge pull request shotgunsoftware#17 from shotgunsoftware/api_access_denied_error

additional custom protocol error message handling

Author: kbehrman

shotgun_api3/shotgun.py

@@ -1255,8 +1255,10 @@ def _call_rpc(self, method, params, include_script_name=True, first=False):
 try:
 self._parse_http_status(http_status)
 exceptProtocolError, e:
-ife.errcode==503:
-e.reason="Shotgun is currently down for maintenance. Please try again later."
+e.headers=resp_headers
+# 403 is returned with custom error page when api access is blocked
+ife.errcode==403:
+e.errmsg+=": %s"%body
 raise
 
 response=self._decode_response(resp_headers, body)
@@ -1385,16 +1387,16 @@ def _parse_http_status(self, status):
  :param status: Tuple of (code, reason).
  """
 error_code=status[0]
-reason=status[1]
+errmsg=status[1]
 
 ifstatus[0] >=300:
-msg="HTTP error from server"
+headers="HTTP error from server"
 ifstatus[0] ==503:
-reason="Shotgun is currently down for maintenance. Please try again later."
+errmsg="Shotgun is currently down for maintenance. Please try again later."
 raiseProtocolError(self.config.server,
 error_code,
-reason,
-msg)
+errmsg,
+headers)
 
 return