Commit080e815

authored

Merge branch 'master' into default-read-timeout

2 parentsc2bdf55 +08fde31 commit080e815Copy full SHA for 080e815

File tree

+1852

-71

lines changed

+1852

-71

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -176,3 +176,5 @@ Contributors`
`176`	`176`	`- Andreas Burger (@AndreasBurger)`
`177`	`177`
`178`	`178`	`- James E. Blair (@jeblair)`
	`179`	`+`
	`180`	`+- Simon Westphahl (@westphahl)`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,10 @@ class App(models.GitHubCore):`
`80`	`80`	`https://developer.github.com/v3/apps/`
`81`	`81`	`"""`
`82`	`82`
	`83`	`+CUSTOM_HEADERS= {`
	`84`	`+"Accept":"application/vnd.github.machine-man-preview+json"`
	`85`	`+ }`
	`86`	`+`
`83`	`87`	`def_update_attributes(self,json):`
`84`	`88`	`self.created_at=self._strptime(json["created_at"])`
`85`	`89`	`self.description=json["description"]`
`@@ -90,6 +94,8 @@ def _update_attributes(self, json):`
`90`	`94`	`self.node_id=json["node_id"]`
`91`	`95`	`self.owner=users.ShortUser(json["owner"],self)`
`92`	`96`	`self.updated_at=self._strptime(json["updated_at"])`
	`97`	`+_,slug=json["html_url"].rsplit("/",1)`
	`98`	`+self._api=self.url=self._build_url("apps",slug)`
`93`	`99`
`94`	`100`	`def_repr(self):`
`95`	`101`	`return'<App ["{}" by {}]>'.format(self.name,str(self.owner))`

Comments

(0)