Commitad79943

committed

Refactor and fix lots of things

1 parent42aee7d commitad79943Copy full SHA for ad79943

File tree

+32

-14

lines changed

+32

-14

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1148,7 +1148,7 @@ class GitHubEnterprise(GitHub):`
`1148`	`1148`	`"""`
`1149`	`1149`	`def__init__(self,url,login='',password='',token=''):`
`1150`	`1150`	`super(GitHubEnterprise,self).__init__(login,password,token)`
`1151`		`-self._github_url=url.rstrip('/')+'/api/v3'`
	`1151`	`+self._session.base_url=url.rstrip('/')+'/api/v3'`
`1152`	`1152`
`1153`	`1153`	`def__repr__(self):`
`1154`	`1154`	`return'<GitHub Enterprise [0.url]>'.format(self)`
`@@ -1177,7 +1177,7 @@ class GitHubStatus(GitHubCore):`
`1177`	`1177`	`"""`
`1178`	`1178`	`def__init__(self):`
`1179`	`1179`	`super(GitHubStatus,self).__init__({})`
`1180`		`-self._github_url='https://status.github.com'`
	`1180`	`+self._session.base_url='https://status.github.com'`
`1181`	`1181`
`1182`	`1182`	`def__repr__(self):`
`1183`	`1183`	`return'<GitHub Status>'`

Lines changed: 1 addition & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`fromdatetimeimportdatetime`
`14`	`14`	`fromloggingimportgetLogger`
`15`	`15`
`16`		`-__url_cache__= {}`
`17`	`16`	`__timeformat__='%Y-%m-%dT%H:%M:%SZ'`
`18`	`17`	`__logs__=getLogger(__package__)`
`19`	`18`
`@@ -136,15 +135,7 @@ def _put(self, url, **kwargs):`
`136`	`135`
`137`	`136`	`def_build_url(self,args,*kwargs):`
`138`	`137`	`"""Builds a new API url from scratch."""`
`139`		`-parts= [kwargs.get('base_url')orself._github_url]`
`140`		`-parts.extend(args)`
`141`		`-parts= [str(p)forpinparts]`
`142`		`-key=tuple(parts)`
`143`		`-__logs__.info('Building a url from %s',key)`
`144`		`-ifnotkeyin__url_cache__:`
`145`		`-__logs__.info('Missed the cache building the url')`
`146`		`-__url_cache__[key]='/'.join(parts)`
`147`		`-return__url_cache__[key]`
	`138`	`+returnself._session.build_url(args,*kwargs)`
`148`	`139`
`149`	`140`	`@property`
`150`	`141`	`def_api(self):`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,10 @@`
`1`	`1`	`importrequests`
`2`	`2`
`3`	`3`	`fromgithub3import__version__`
	`4`	`+fromloggingimportgetLogger`
	`5`	`+`
	`6`	`+__url_cache__= {}`
	`7`	`+__logs__=getLogger(__package__)`
`4`	`8`
`5`	`9`
`6`	`10`	`classGitHubSession(requests.Session):`
`@@ -16,6 +20,7 @@ def __init__(self):`
`16`	`20`	`# Set our own custom User-Agent string`
`17`	`21`	`'User-Agent':'github3.py/{0}'.format(__version__),`
`18`	`22`	`})`
	`23`	`+self.base_url='https://api.github.com'`
`19`	`24`
`20`	`25`	`defbasic_auth(self,username,password):`
`21`	`26`	`"""Set the Basic Auth credentials on this Session.`
`@@ -28,6 +33,18 @@ def basic_auth(self, username, password):`
`28`	`33`
`29`	`34`	`self.auth= (username,password)`
`30`	`35`
	`36`	`+defbuild_url(self,args,*kwargs):`
	`37`	`+"""Builds a new API url from scratch."""`
	`38`	`+parts= [kwargs.get('base_url')orself.base_url]`
	`39`	`+parts.extend(args)`
	`40`	`+parts= [str(p)forpinparts]`
	`41`	`+key=tuple(parts)`
	`42`	`+__logs__.info('Building a url from %s',key)`
	`43`	`+ifnotkeyin__url_cache__:`
	`44`	`+__logs__.info('Missed the cache building the url')`
	`45`	`+__url_cache__[key]='/'.join(parts)`
	`46`	`+return__url_cache__[key]`
	`47`	`+`
`31`	`48`	`deftoken_auth(self,token):`
`32`	`49`	`"""Use an application token for authentication.`
`33`	`50`

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,14 @@`
`1`	`1`	`importmock`
`2`		`-importrequests`
	`2`	`+importgithub3`
`3`	`3`	`importunittest`
`4`	`4`
`5`		`-MockedSession=mock.create_autospec(requests.Session)`
	`5`	`+MockedSession=mock.create_autospec(github3.session.GitHubSession)`
	`6`	`+`
	`7`	`+`
	`8`	`+defbuild_url(self,args,*kwargs):`
	`9`	`+# We want to assert what is happening with the actual calls to the`
	`10`	`+# Internet. We can proxy this.`
	`11`	`+returngithub3.session.GitHubSession().build_url(args,*kwargs)`
`6`	`12`
`7`	`13`
`8`	`14`	`classUnitHelper(unittest.TestCase):`
`@@ -28,3 +34,7 @@ def create_session_mock(self, *args):`
`28`	`34`	`defsetUp(self):`
`29`	`35`	`self.session=self.create_session_mock()`
`30`	`36`	`self.instance=self.described_class(self.example_data,self.session)`
	`37`	`+# Proxy the build_url method to the class so it can build the URL and`
	`38`	`+# we can assert things about the call that will be attempted to the`
	`39`	`+# internet`
	`40`	`+self.described_class._build_url=build_url`

Comments

(0)