Commit4443eeb

authored

Merge pull requestsigmavirus24#962 from smendes/fix-getattr

Fix potential infinite recursion in __getattr__

2 parents9e749aa +5509030 commit4443eebCopy full SHA for 4443eeb

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -183,4 +183,6 @@ Contributors`
`183`	`183`
`184`	`184`	`- Tigran Tchougourian (@NargiT)`
`185`	`185`
`186`		`-- Dimitri Merejkowsky (@dmerejkowsky)`
	`186`	`+- Samuel Mendes (@smendes)`
	`187`	`+`
	`188`	`+- Dimitri Merejkowsky (@dmerejkowsky)`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,10 @@ def _update_attributes(self, json):`
`54`	`54`
`55`	`55`	`def__getattr__(self,attribute):`
`56`	`56`	`"""Proxy access to stored JSON."""`
`57`		`-ifattributenotinself._json_data:`
	`57`	`+_json_data=object.__getattribute__(self,"_json_data")`
	`58`	`+ifattributenotin_json_data:`
`58`	`59`	`raiseAttributeError(attribute)`
`59`		`-value=self._json_data.get(attribute)`
	`60`	`+value=_json_data[attribute]`
`60`	`61`	`setattr(self,attribute,value)`
`61`	`62`	`returnvalue`
`62`	`63`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`importpytest`
`4`	`4`	`importrequests`
`5`	`5`
	`6`	`+fromcopyimportcopy`
`6`	`7`	`fromdatetimeimportdatetime,timedelta`
`7`	`8`	`fromgithub3importexceptions,GitHubError`
`8`	`9`	`fromgithub3.modelsimportGitHubCore`
`@@ -206,6 +207,10 @@ def test_strptime_time_str_required(self):`
`206`	`207`	`"""Verify that method converts ISO 8601 formatted string."""`
`207`	`208`	`assertself.instance._strptime("")isNone`
`208`	`209`
	`210`	`+deftest_can_be_copied(self):`
	`211`	`+"""Verify that a GithubCore object can be copied."""`
	`212`	`+assertcopy(self.instance)isnotNone`
	`213`	`+`
`209`	`214`
`210`	`215`	`classTestGitHubCoreIssue672(helper.UnitHelper):`
`211`	`216`

Comments

(0)