Merge pull request sigmavirus24#391 from antoine-g/issue/370-backport0.9

sigmavirus24 · sigmavirus24 · commit 96316e15c100 · 2015-06-17T07:43:59.000-05:00
Fix exception when merging with empty commit message (backport)
diff --git a/github3/pulls.py b/github3/pulls.py
@@ -307,9 +307,7 @@ def merge(self, commit_message=''):
             merge commit
         :returns: bool
         """
-        data = None
-        if commit_message:
-            data = dumps({'commit_message': commit_message})
+        data = dumps({'commit_message': commit_message})
         url = self._build_url('merge', base_url=self._api)
         json = self._json(self._put(url, data=data), 200)
         self.merge_commit_sha = json['sha']
diff --git a/tests/test_pulls.py b/tests/test_pulls.py
@@ -107,7 +107,7 @@ def test_iter_files(self):
     def test_merge(self):
         self.response('merge', 200)
         self.put(self.api + '/merge')
-        self.conf = {'data': None}
+        self.conf = {'data': {'commit_message': ''}}
 
         self.assertRaises(github3.GitHubError, self.pull.merge)
 
