Fix a consistency issue.

sigmavirus24 · sigmavirus24 · commit 2925386f7939 · 2012-12-08T19:47:36.000-05:00
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -14,6 +14,10 @@ History/Changelog
 
   - is_active() and active return the same value
 
+- In github3.pulls.PullRequest
+
+  - is_mergeable() and mergeable are now the same
+
 - Some objects now have ``__str__`` methods. You can now do things like:
 
   ::
diff --git a/github3/pulls.py b/github3/pulls.py
@@ -128,7 +128,7 @@ def __init__(self, pull, session=None):
         # If the pull request has been merged
         if self.merged_at:
             self.merged_at = self._strptime(self.merged_at)
-        self._mergeable = pull.get('mergeable')
+        self.mergeable = pull.get('mergeable', False)
         #: :class:`User <github3.users.User>` who merged this pull
         self.merged_by = pull.get('merged_by')
         if self.merged_by:
@@ -168,7 +168,7 @@ def is_mergeable(self):
 
         :returns: bool
         """
-        return False if self._mergeable is None else self._mergeable
+        return self.mergeable
 
     def is_merged(self):
         """Checks to see if the pull request was merged.
@@ -248,6 +248,7 @@ def merge(self, commit_message=''):
             data = {'commit_message': commit_message}
         url = self._build_url('merge', base_url=self._api)
         resp = self._put(url, data)
+        self.merge_commit_sha = resp['merge_commit_sha']
         return resp.json['merged']
 
     @requires_auth
