Return bytes from Contents.decoded for empty files

thebrid · thebrid · commit 54c99cb94daf · 2022-01-19T21:01:12.000Z
According to the docs, Contents.decoded should return bytes. However, in the
case of empty files, it currently returns str. Make it return bytes also for
empty files.
diff --git a/src/github3/repos/contents.py b/src/github3/repos/contents.py
@@ -85,7 +85,7 @@ def _update_attributes(self, content):
         self.content = content.get("content")
         self.encoding = content.get("encoding")
         self.decoded = self.content
-        if self.encoding == "base64" and self.content:
+        if self.encoding == "base64" and self.content is not None:
             self.decoded = b64decode(self.content.encode())
         self.download_url = content["download_url"]
         self.git_url = content["git_url"]
diff --git a/tests/unit/test_repos_repo.py b/tests/unit/test_repos_repo.py
@@ -582,6 +582,30 @@ def test_file_contents(self):
             url_for("contents/path/to/file.txt"), params={"ref": "some-sha"}
         )
 
+    def test_file_contents_works_for_empty_file(self):
+        """Verify file_contents works for an empty file edge case."""
+        mock_response = unittest.mock.MagicMock(status_code=200)
+        mock_response.json.return_value = {
+            "content": "",
+            "download_url": "",
+            "encoding": "base64",
+            "git_url": "",
+            "html_url": "",
+            "name": "",
+            "path": "",
+            "sha": "",
+            "size": "",
+            "type": "",
+            "url": "",
+            "_links": "",
+        }
+        self.session.get.return_value = mock_response
+
+        file_contents = self.instance.file_contents(
+            "path/to/empty_file.txt", ref="some-sha"
+        )
+        assert file_contents.decoded == b""
+
     def test_git_commit_required_sha(self):
         """Verify the request for retrieving a git commit from a repository."""
         self.instance.git_commit("")
