Merge pull request sigmavirus24#632 from itsmemattchung/issue/627

sigmavirus24 · web-flow · commit 7ebca532da8d · 2016-07-27T07:04:07.000-05:00
Raise exception for instance_or_null
diff --git a/github3/models.py b/github3/models.py
@@ -143,7 +143,7 @@ def _instance_or_null(self, instance_class, json):
         if json is None:
             return NullObject(instance_class.__name__)
         if not isinstance(json, dict):
-            return exceptions.UnprocessableResponseBody(
+            raise exceptions.UnprocessableResponseBody(
                 "GitHub's API returned a body that could not be handled", json
             )
         try:
diff --git a/tests/unit/test_models.py b/tests/unit/test_models.py
@@ -107,6 +107,11 @@ def test_from_json(self):
         github_core = GitHubCore.from_json('{}')
         assert isinstance(github_core, GitHubCore)
 
+    def test_instance_or_null(self):
+        """Verify method raises exception when json is not a dict."""
+        with pytest.raises(exceptions.UnprocessableResponseBody):
+            self.instance._instance_or_null(GitHubCore, [])
+
     def test_json(self):
         """Verify JSON information is retrieved correctly."""
         response = requests.Response()

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ def _instance_or_null(self, instance_class, json):`
`143`	`143`	`if json is None:`
`144`	`144`	`return NullObject(instance_class.__name__)`
`145`	`145`	`if not isinstance(json, dict):`
`146`		`- return exceptions.UnprocessableResponseBody(`
	`146`	`+ raise exceptions.UnprocessableResponseBody(`
`147`	`147`	`"GitHub's API returned a body that could not be handled", json`
`148`	`148`	`)`
`149`	`149`	`try:`