Merge pull request sigmavirus24#799 from sigmavirus24/bug/798

sigmavirus24 · web-flow · commit dcb72b3b4d75 · 2018-03-20T18:47:23.000-05:00
Handle 304 responses from GitHub when users pass etag
diff --git a/github3/models.py b/github3/models.py
@@ -154,9 +154,15 @@ def _json(self, response, expected_status_code, include_cache_info=True):
         if actual_status_code != expected_status_code:
             if actual_status_code >= 400:
                 raise exceptions.error_for(response)
+
+            if actual_status_code == 304:
+                # Received a response from someone passing in `etag=`
+                return None
+
             LOG.warning('Expected status_code %d but got %d',
                         expected_status_code,
                         actual_status_code)
+
         try:
             ret = response.json()
         except ValueError:
