Commit5a838d2

committed

Progress towards pengwynn/octokit like behavior

This lets us store the ETag for calls to endpoints that we return asiterators. It is an awesome little bit of python.

1 parent4fb1575 commit5a838d2Copy full SHA for 5a838d2

File tree

-23

lines changed

-23

lines changed

Lines changed: 4 additions & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -139,35 +139,17 @@ def api(self):`
`139`	`139`	`defapi(self,uri):`
`140`	`140`	`self._uri=urlparse(uri)`
`141`	`141`
`142`		`-def_iter(self,count,url,cls,params=None):`
	`142`	`+def_iter(self,count,url,cls,params=None,etag=None):`
`143`	`143`	`"""Generic iterator for this project.`
`144`	`144`
`145`	`145`	`:param int count: How many items to return.`
`146`	`146`	`:param int url: First URL to start with`
`147`	`147`	`:param class cls: cls to return an object of`
`148`	`148`	`:param params dict: (optional) Parameters for the request`
	`149`	`+ :param str etag: (optional), ETag from the last call`
`149`	`150`	`"""`
`150`		`-while (count==-1orcount>0)andurl:`
`151`		`-response=self._get(url,params=params)`
`152`		`-ifparams:`
`153`		`-params=None# rel_next contains the params`
`154`		`-json=self._json(response,200)`
`155`		`-`
`156`		`-ifjsonisNone:`
`157`		`-break`
`158`		`-`
`159`		`-# languages returns a single dict. We want the items.`
`160`		`-ifisinstance(json,dict):`
`161`		`-json=json.items()`
`162`		`-`
`163`		`-foriinjson:`
`164`		`-yieldcls(i,self)ifissubclass(cls,GitHubCore)elsecls(i)`
`165`		`-count-=1ifcount>0else0`
`166`		`-ifcount==0:`
`167`		`-break`
`168`		`-`
`169`		`-rel_next=response.links.get('next', {})`
`170`		`-url=rel_next.get('url','')`
	`151`	`+fromgithub3.structsimportGitHubIterable`
	`152`	`+returnGitHubIterable(count,url,cls,params,etag)`
`171`	`153`
`172`	`154`	`@property`
`173`	`155`	`defratelimit_remaining(self):`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ def __init__(self, user, session=None):`
`121`	`121`	`self.plan=Plan(user.get('plan', {}))`
`122`	`122`
`123`	`123`	`def__repr__(self):`
`124`		`-return'<User [{0}:{1}]>'.format(self.login,self.name)`
	`124`	`+return'<User [{0}:{1:s}]>'.format(self.login,self.name)`
`125`	`125`
`126`	`126`	`def__str__(self):`
`127`	`127`	`returnself.login`

Comments

(0)