Add support for getting patches and diffs

sigmavirus24 · sigmavirus24 · commit 12afbbe9a35a · 2012-12-10T13:52:09.000-05:00
http://developer.github.com/changes/2012-12-10-Diff-and-patch-media-types/
diff --git a/github3/pulls.py b/github3/pulls.py
@@ -169,6 +169,12 @@ def close(self):
         """
         return self.update(self.title, self.body, 'closed')
 
+    def diff(self):
+        """Return the diff"""
+        resp = self._get(self._api,
+                         headers={'Accept': 'application/vnd.github.diff'})
+        return resp.content if self._boolean(resp, 200, 404) else None
+
     def is_mergeable(self):
         """Checks to see if the pull request can be merged by GitHub.
 
@@ -257,6 +263,12 @@ def merge(self, commit_message=''):
         self.merge_commit_sha = resp['merge_commit_sha']
         return resp.json['merged']
 
+    def patch(self):
+        """Return the patch"""
+        resp = self._get(self._api,
+                         headers={'Accept': 'application/vnd.github.patch'})
+        return resp.content if self._boolean(resp, 200, 404) else None
+
     @requires_auth
     def reopen(self):
         """Re-open a closed Pull Request.
diff --git a/github3/repos.py b/github3/repos.py
@@ -1648,15 +1648,27 @@ def __init__(self, commit, session=None):
     def __repr__(self):
         return '<Repository Commit [{0}]>'.format(self.sha[:7])
 
+    def diff(self):
+        """Return the diff"""
+        resp = self._get(self._api,
+                         headers={'Accept': 'application/vnd.github.diff'})
+        return resp.content if self._boolean(resp, 200, 404) else None
 
-class Comparison(GitHubObject):
+    def patch(self):
+        """Return the patch"""
+        resp = self._get(self._api,
+                         headers={'Accept': 'application/vnd.github.patch'})
+        return resp.content if self._boolean(resp, 200, 404) else None
+
+
+class Comparison(GitHubCore):
     """The :class:`Comparison <Comparison>` object. This encapsulates the
     information returned by GitHub comparing two commit objects in a
     repository."""
 
     def __init__(self, compare):
         super(Comparison, self).__init__(compare)
-        self._api = compare.get('api', '')
+        self._api = compare.get('url', '')
         #: URL to view the comparison at GitHub
         self.html_url = compare.get('html_url')
         #: Permanent link to this comparison.
@@ -1684,6 +1696,18 @@ def __init__(self, compare):
     def __repr__(self):
         return '<Comparison of {0} commits>'.format(self.total_commits)
 
+    def diff(self):
+        """Return the diff"""
+        resp = self._get(self._api,
+                         headers={'Accept': 'application/vnd.github.diff'})
+        return resp.content if self._boolean(resp, 200, 404) else None
+
+    def patch(self):
+        """Return the patch"""
+        resp = self._get(self._api,
+                         headers={'Accept': 'application/vnd.github.patch'})
+        return resp.content if self._boolean(resp, 200, 404) else None
+
 
 class Status(GitHubObject):
     """The :class:`Status <Status>` object. This represents information from
