NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit7bb022a

committed

Merge pull requestsigmavirus24#598 from sigmavirus24/bug/597

Capture and re-raise exceptions from Requests

2 parents1f0bc67 +36a08aa commit7bb022aCopy full SHA for 7bb022a

File tree

16 files changed

+195

-149

lines changed

16 files changed

+195

-149

lines changed

`‎github3/init.py`

Lines changed: 79 additions & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,35 +16,89 @@`
`16`	`16`	`__url__,`
`17`	`17`	`)`
`18`	`18`	`from .apiimport (`
`19`		`-authorize,login,enterprise_login,emojis,gist,gitignore_template,`
`20`		`-create_gist,issue,markdown,octocat,organization,pull_request,`
`21`		`-followers_of,followed_by,public_gists,gists_by,issues_on,`
`22`		`-gitignore_templates,all_repositories,all_users,all_events,`
`23`		`-organizations_with,repositories_by,starred_by,subscriptions_for,`
`24`		`-rate_limit,repository,search_code,search_repositories,search_users,`
`25`		`-search_issues,user,zen`
	`19`	`+all_events,`
	`20`	`+all_repositories,`
	`21`	`+all_users,`
	`22`	`+authorize,`
	`23`	`+create_gist,`
	`24`	`+emojis,`
	`25`	`+enterprise_login,`
	`26`	`+followed_by,`
	`27`	`+followers_of,`
	`28`	`+gist,`
	`29`	`+gists_by,`
	`30`	`+gitignore_template,`
	`31`	`+gitignore_templates,`
	`32`	`+issue,`
	`33`	`+issues_on,`
	`34`	`+login,`
	`35`	`+markdown,`
	`36`	`+octocat,`
	`37`	`+organization,`
	`38`	`+organizations_with,`
	`39`	`+public_gists,`
	`40`	`+pull_request,`
	`41`	`+rate_limit,`
	`42`	`+repositories_by,`
	`43`	`+repository,`
	`44`	`+search_code,`
	`45`	`+search_issues,`
	`46`	`+search_repositories,`
	`47`	`+search_users,`
	`48`	`+starred_by,`
	`49`	`+subscriptions_for,`
	`50`	`+user,`
	`51`	`+zen`
`26`	`52`	`)`
`27`	`53`	`from .githubimportGitHub,GitHubEnterprise,GitHubStatus`
`28`		`-from .exceptionsimport (`
`29`		`-BadRequest,AuthenticationFailed,ForbiddenError,GitHubError,`
`30`		`-MethodNotAllowed,NotFoundError,ServerError,NotAcceptable,`
`31`		`-UnprocessableEntity`
`32`		`-)`
	`54`	`+from .exceptionsimportGitHubError`
`33`	`55`
`34`	`56`	`__all__= (`
`35`		`-'AuthenticationFailed','BadRequest','ForbiddenError','GitHub',`
`36`		`-'GitHubEnterprise','GitHubError','GitHubStatus',`
`37`		`-'MethodNotAllowed','NotAcceptable','NotFoundError','ServerError',`
`38`		`-'UnprocessableEntity','authorize','login','enterprise_login','emojis',`
`39`		`-'gist','gitignore_template','create_gist','issue','markdown',`
`40`		`-'octocat','organization','pull_request','followers_of','followed_by',`
`41`		`-'public_gists','gists_by','issues_on','gitignore_templates',`
`42`		`-'all_repositories','all_users','all_events','organizations_with',`
`43`		`-'repositories_by','starred_by','subscriptions_for','rate_limit',`
`44`		`-'repository','search_code','search_repositories','search_users',`
`45`		`-'search_issues','user','zen',`
	`57`	`+'GitHub',`
	`58`	`+'GitHubEnterprise',`
	`59`	`+'GitHubError',`
	`60`	`+'GitHubStatus',`
	`61`	`+'authorize',`
	`62`	`+'login',`
	`63`	`+'enterprise_login',`
	`64`	`+'emojis',`
	`65`	`+'gist',`
	`66`	`+'gitignore_template',`
	`67`	`+'create_gist',`
	`68`	`+'issue',`
	`69`	`+'markdown',`
	`70`	`+'octocat',`
	`71`	`+'organization',`
	`72`	`+'pull_request',`
	`73`	`+'followers_of',`
	`74`	`+'followed_by',`
	`75`	`+'public_gists',`
	`76`	`+'gists_by',`
	`77`	`+'issues_on',`
	`78`	`+'gitignore_templates',`
	`79`	`+'all_repositories',`
	`80`	`+'all_users',`
	`81`	`+'all_events',`
	`82`	`+'organizations_with',`
	`83`	`+'repositories_by',`
	`84`	`+'starred_by',`
	`85`	`+'subscriptions_for',`
	`86`	`+'rate_limit',`
	`87`	`+'repository',`
	`88`	`+'search_code',`
	`89`	`+'search_repositories',`
	`90`	`+'search_users',`
	`91`	`+'search_issues',`
	`92`	`+'user',`
	`93`	`+'zen',`
`46`	`94`	`# Metadata attributes`
`47`		`-'__package_name__','__title__','__author__','__author_email__',`
`48`		`-'__license__','__copyright__','__version__','__version_info__',`
	`95`	`+'__package_name__',`
	`96`	`+'__title__',`
	`97`	`+'__author__',`
	`98`	`+'__author_email__',`
	`99`	`+'__license__',`
	`100`	`+'__copyright__',`
	`101`	`+'__version__',`
	`102`	`+'__version_info__',`
`49`	`103`	`'__url__',`
`50`	`104`	`)`

`‎github3/exceptions.py`

Lines changed: 35 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,32 @@ def message(self):`
`34`	`34`	`returnself.msg`
`35`	`35`
`36`	`36`
`37`		`-classUnprocessableResponseBody(GitHubError):`
	`37`	`+classResponseError(GitHubError):`
	`38`	`+"""The base exception for errors stemming from GitHub responses."""`
	`39`	`+pass`
	`40`	`+`
	`41`	`+`
	`42`	`+classTransportError(GitHubError):`
	`43`	`+"""Catch-all exception for errors coming from Requests."""`
	`44`	`+`
	`45`	`+msg_format='An error occurred while making a request to GitHub: {0}'`
	`46`	`+`
	`47`	`+def__init__(self,exception):`
	`48`	`+Exception.__init__(self,exception)`
	`49`	`+self.exception=exception`
	`50`	`+self.msg=self.msg_format.format(str(exception))`
	`51`	`+`
	`52`	`+def__str__(self):`
	`53`	`+return'{0}: {1}'.format(type(self.exception),self.msg)`
	`54`	`+`
	`55`	`+`
	`56`	`+classConnectionError(TransportError):`
	`57`	`+"""Exception for errors in connecting to or reading data from GitHub."""`
	`58`	`+`
	`59`	`+msg_format='A connection-level exception occurred: {0}'`
	`60`	`+`
	`61`	`+`
	`62`	`+classUnprocessableResponseBody(ResponseError):`
`38`	`63`	`"""Exception class for response objects that cannot be handled."""`
`39`	`64`	`def__init__(self,message,body):`
`40`	`65`	`Exception.__init__(self,message)`
`@@ -48,12 +73,12 @@ def __str__(self):`
`48`	`73`	`returnself.message`
`49`	`74`
`50`	`75`
`51`		`-classBadRequest(GitHubError):`
	`76`	`+classBadRequest(ResponseError):`
`52`	`77`	`"""Exception class for 400 responses."""`
`53`	`78`	`pass`
`54`	`79`
`55`	`80`
`56`		`-classAuthenticationFailed(GitHubError):`
	`81`	`+classAuthenticationFailed(ResponseError):`
`57`	`82`	`"""Exception class for 401 responses.`
`58`	`83`
`59`	`84`	`Possible reasons:`
`@@ -64,7 +89,7 @@ class AuthenticationFailed(GitHubError):`
`64`	`89`	`pass`
`65`	`90`
`66`	`91`
`67`		`-classForbiddenError(GitHubError):`
	`92`	`+classForbiddenError(ResponseError):`
`68`	`93`	`"""Exception class for 403 responses.`
`69`	`94`
`70`	`95`	`Possible reasons:`
`@@ -75,32 +100,32 @@ class ForbiddenError(GitHubError):`
`75`	`100`	`pass`
`76`	`101`
`77`	`102`
`78`		`-classNotFoundError(GitHubError):`
	`103`	`+classNotFoundError(ResponseError):`
`79`	`104`	`"""Exception class for 404 responses."""`
`80`	`105`	`pass`
`81`	`106`
`82`	`107`
`83`		`-classMethodNotAllowed(GitHubError):`
	`108`	`+classMethodNotAllowed(ResponseError):`
`84`	`109`	`"""Exception class for 405 responses."""`
`85`	`110`	`pass`
`86`	`111`
`87`	`112`
`88`		`-classNotAcceptable(GitHubError):`
	`113`	`+classNotAcceptable(ResponseError):`
`89`	`114`	`"""Exception class for 406 responses."""`
`90`	`115`	`pass`
`91`	`116`
`92`	`117`
`93`		`-classUnprocessableEntity(GitHubError):`
	`118`	`+classUnprocessableEntity(ResponseError):`
`94`	`119`	`"""Exception class for 422 responses."""`
`95`	`120`	`pass`
`96`	`121`
`97`	`122`
`98`		`-classClientError(GitHubError):`
	`123`	`+classClientError(ResponseError):`
`99`	`124`	`"""Catch-all for 400 responses that aren't specific errors."""`
`100`	`125`	`pass`
`101`	`126`
`102`	`127`
`103`		`-classServerError(GitHubError):`
	`128`	`+classServerError(ResponseError):`
`104`	`129`	`"""Exception class for 5xx responses."""`
`105`	`130`	`pass`
`106`	`131`

`‎github3/models.py`

Lines changed: 18 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`	`fromdatetimeimportdatetime`
`14`	`14`	`fromloggingimportgetLogger`
`15`	`15`
	`16`	`+importrequests`
	`17`	`+`
`16`	`18`	`from .importexceptions`
`17`	`19`	`from .decoratorsimportrequires_auth`
`18`	`20`	`from .nullimportNullObject`
`@@ -176,27 +178,38 @@ def _boolean(self, response, true_code, false_code):`
`176`	`178`	`raiseexceptions.error_for(response)`
`177`	`179`	`returnFalse`
`178`	`180`
	`181`	`+def_request(self,method,args,*kwargs):`
	`182`	`+try:`
	`183`	`+request_method=getattr(self.session,method)`
	`184`	`+returnrequest_method(args,*kwargs)`
	`185`	`+except (requests.exceptions.ConnectionError,`
	`186`	`+requests.exceptions.Timeout,`
	`187`	`+ )asexc:`
	`188`	`+raiseexceptions.ConnectionError(exc)`
	`189`	`+exceptrequests.exceptions.RequestExceptionasexc:`
	`190`	`+raiseexceptions.TransportError(exc)`
	`191`	`+`
`179`	`192`	`def_delete(self,url,**kwargs):`
`180`	`193`	`__logs__.debug('DELETE %s with %s',url,kwargs)`
`181`		`-returnself.session.delete(url,**kwargs)`
	`194`	`+returnself._request('delete',url,**kwargs)`
`182`	`195`
`183`	`196`	`def_get(self,url,**kwargs):`
`184`	`197`	`__logs__.debug('GET %s with %s',url,kwargs)`
`185`		`-returnself.session.get(url,**kwargs)`
	`198`	`+returnself._request('get',url,**kwargs)`
`186`	`199`
`187`	`200`	`def_patch(self,url,**kwargs):`
`188`	`201`	`__logs__.debug('PATCH %s with %s',url,kwargs)`
`189`		`-returnself.session.patch(url,**kwargs)`
	`202`	`+returnself._request('patch',url,**kwargs)`
`190`	`203`
`191`	`204`	`def_post(self,url,data=None,json=True,**kwargs):`
`192`	`205`	`ifjson:`
`193`	`206`	`data=dumps(data)ifdataisnotNoneelsedata`
`194`	`207`	`__logs__.debug('POST %s with %s, %s',url,data,kwargs)`
`195`		`-returnself.session.post(url,data,**kwargs)`
	`208`	`+returnself._request('post',url,data,**kwargs)`
`196`	`209`
`197`	`210`	`def_put(self,url,**kwargs):`
`198`	`211`	`__logs__.debug('PUT %s with %s',url,kwargs)`
`199`		`-returnself.session.put(url,**kwargs)`
	`212`	`+returnself._request('put',url,**kwargs)`
`200`	`213`
`201`	`214`	`def_build_url(self,args,*kwargs):`
`202`	`215`	`"""Builds a new API url from scratch."""`