Merge pull request sigmavirus24#962 from smendes/fix-getattr

sigmavirus24 · web-flow · commit 4443eebc13a4 · 2019-07-30T10:19:05.000-05:00
Fix potential infinite recursion in __getattr__
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -183,4 +183,6 @@ Contributors
 
 - Tigran Tchougourian (@NargiT)
 
-- Dimitri Merejkowsky (@dmerejkowsky)
+- Samuel Mendes (@smendes)
+
+- Dimitri Merejkowsky (@dmerejkowsky)
diff --git a/src/github3/models.py b/src/github3/models.py
@@ -54,9 +54,10 @@ def _update_attributes(self, json):
 
     def __getattr__(self, attribute):
         """Proxy access to stored JSON."""
-        if attribute not in self._json_data:
+        _json_data = object.__getattribute__(self, "_json_data")
+        if attribute not in _json_data:
             raise AttributeError(attribute)
-        value = self._json_data.get(attribute)
+        value = _json_data[attribute]
         setattr(self, attribute, value)
         return value
 
diff --git a/tests/unit/test_models.py b/tests/unit/test_models.py
@@ -3,6 +3,7 @@
 import pytest
 import requests
 
+from copy import copy
 from datetime import datetime, timedelta
 from github3 import exceptions, GitHubError
 from github3.models import GitHubCore
@@ -206,6 +207,10 @@ def test_strptime_time_str_required(self):
         """Verify that method converts ISO 8601 formatted string."""
         assert self.instance._strptime("") is None
 
+    def test_can_be_copied(self):
+        """Verify that a GithubCore object can be copied."""
+        assert copy(self.instance) is not None
+
 
 class TestGitHubCoreIssue672(helper.UnitHelper):
 
