sigmavirus24 · sigmavirus24 · Feb 18, 2016 · Feb 18, 2016
diff --git a/github3/models.py b/github3/models.py
@@ -23,12 +23,26 @@
 __logs__ = getLogger(__package__)
 
 
-class GitHubObject(object):
-    """The :class:`GitHubObject <GitHubObject>` object. A basic class to be
-    subclassed by GitHubCore and other classes that would otherwise subclass
-    object."""
-    def __init__(self, json):
-        super(GitHubObject, self).__init__()
+class GitHubCore(object):
+
+    """The base object for all objects that require a session.
+
+    The :class:`GitHubCore <GitHubCore>` object provides some
+    basic attributes and methods to other sub-classes that are very useful to
+    have.
+    """
+
+    def __init__(self, json, session=None):
+        if hasattr(session, 'session'):
+            # i.e. session is actually a GitHubCore instance
+            session = session.session
+        elif session is None:
+            session = GitHubSession()
+        self.session = session
+
+        # set a sane default
+        self._github_url = 'https://api.github.com'
+
         if json is not None:
             self.etag = json.pop('ETag', None)
             self.last_modified = json.pop('Last-Modified', None)
@@ -87,9 +101,6 @@ def _strptime(self, time_str):
             return dt.replace(tzinfo=UTC())
         return None
 
-    def _repr(self):
-        return '<github3-object at 0x{0:x}>'.format(id(self))
-
     def __repr__(self):
         repr_string = self._repr()
         if is_py2:
@@ -115,28 +126,6 @@ def __ne__(self, other):
     def __hash__(self):
         return hash(self._uniq)
 
-
-class GitHubCore(GitHubObject):
-
-    """The base object for all objects that require a session.
-
-    The :class:`GitHubCore <GitHubCore>` object provides some
-    basic attributes and methods to other sub-classes that are very useful to
-    have.
-    """
-
-    def __init__(self, json, session=None):
-        if hasattr(session, 'session'):
-            # i.e. session is actually a GitHubCore instance
-            session = session.session
-        elif session is None:
-            session = GitHubSession()
-        self.session = session
-
-        # set a sane default
-        self._github_url = 'https://api.github.com'
-        super(GitHubCore, self).__init__(json)
-
     def _repr(self):
         return '<github3-core at 0x{0:x}>'.format(id(self))
 

diff --git a/github3/models/githubcore.py b/github3/models/githubcore.py
diff --git a/tests/unit/test_models.py b/tests/unit/test_models.py
@@ -4,7 +4,7 @@
 
 from datetime import datetime, timedelta
 from github3 import exceptions, GitHubError
-from github3.models import GitHubCore, GitHubObject
+from github3.models import GitHubCore
 from unittest import TestCase
 from . import helper
 
@@ -18,16 +18,6 @@ def __init__(self, example_data, session=None):
         self.etag = example_data['etag']
 
 
-class MyGetAttrTestClass(GitHubObject):
-    """Subclass for testing getattr on GitHubObject."""
-
-    def __init__(self, example_data, session=None):
        super(MyGetAttrTestClass, self).__init__(example_data)
-
-    def _update_attributes(self, json_data):
-        self.fake_attr = json_data.get('fake_attr')
-
-
 class TestGitHubError(TestCase):
     """Test methods on GitHubError class."""
 
@@ -55,30 +45,6 @@ def test_str(self):
         assert str(self.instance) == '400 m'
 
 
-class TestGitHubObject(helper.UnitHelper):
-    """Test methods on GitHubObject class."""
-
-    described_class = MyGetAttrTestClass
-    example_data = {
-        'fake_attr': 'foo',
-        'another_fake_attr': 'bar'
-    }
-
-    def test_from_json(self):
-        """Verify that method returns GitHubObject from json."""
-        github_object = GitHubObject.from_json('{}')
-        assert isinstance(github_object, GitHubObject)
-
-    def test_exposes_attributes(self):
-        """Verify JSON attributes are exposed even if not explicitly set."""
-        assert self.instance.another_fake_attr == 'bar'
-
-    def test_missingattribute(self):
-        """Test AttributeError is raised when attribute is not in JSON."""
-        with pytest.raises(AttributeError):
-            self.instance.missingattribute
-
-
 class TestGitHubCore(helper.UnitHelper):
 
     described_class = MyTestRefreshClass
@@ -90,7 +56,8 @@ class TestGitHubCore(helper.UnitHelper):
     example_data = {
         'url': url,
         'last_modified': last_modified,
-        'etag': etag
+        'etag': etag,
+        'fake_attr': 'foo',
     }
 
     def test_boolean(self):
@@ -130,6 +97,15 @@ def test_boolean_empty_response(self):
 
         assert boolean is False
 
+    def test_exposes_attributes(self):
+        """Verify JSON attributes are exposed even if not explicitly set."""
+        assert self.instance.fake_attr == 'foo'
+
+    def test_from_json(self):
+        """Verify that method returns GitHubObject from json."""
+        github_core = GitHubCore.from_json('{}')
+        assert isinstance(github_core, GitHubCore)
+
     def test_json(self):
         """Verify JSON information is retrieved correctly."""
         response = requests.Response()
@@ -150,6 +126,11 @@ def test_json_status_code_does_not_match(self):
         json = self.instance._json(response, 200)
         assert json is None
 
+    def test_missingattribute(self):
+        """Test AttributeError is raised when attribute is not in JSON."""
+        with pytest.raises(AttributeError):
+            self.instance.missingattribute
+
     def test_refresh(self):
         """Verify the request of refreshing an object."""
         instance = self.instance.refresh()