Merge branch 'pr/461' into develop

sigmavirus24 · sigmavirus24 · commit 1054568cd0bd · 2015-11-07T21:42:52.000-06:00
diff --git a/github3/repos/contents.py b/github3/repos/contents.py
@@ -53,7 +53,7 @@ def _update_attributes(self, content):
 
         # content, base64 encoded and decoded
         #: Base64-encoded content of the file.
-        self.content = content.get('content', '')
+        self.content = content.get('content')
 
         #: Decoded content of the file as a bytes object. If we try to decode
         #: to character set for you, we might encounter an exception which
@@ -62,7 +62,7 @@ def _update_attributes(self, content):
         #: with the character set you wish to use, e.g.,
         #: ``content.decoded.decode('utf-8')``.
         #: .. versionchanged:: 0.5.2
-        self.decoded = b''
+        self.decoded = self.content
         if self.encoding == 'base64' and self.content:
             self.decoded = b64decode(self.content.encode())
 
diff --git a/tests/integration/test_repos_repo.py b/tests/integration/test_repos_repo.py
@@ -199,6 +199,8 @@ def test_directory_contents(self):
         for (filename, content) in contents:
             assert content.name == filename
             assert isinstance(content, github3.repos.contents.Contents)
+            assert content.content is None
+            assert content.decoded is None
 
     def test_events(self):
         """Test that a user can iterate over the events from a repository."""
@@ -220,6 +222,8 @@ def test_file_contents(self):
             contents = repository.file_contents('github3/repos/repo.py')
 
         assert isinstance(contents, github3.repos.contents.Contents)
+        assert contents.content is not None
+        assert contents.decoded is not None
 
     def test_forks(self):
         """Test that a user can iterate over the forks of a repository."""
