Merge pull request sigmavirus24#390 from antoine-g/issue/370

sigmavirus24 · sigmavirus24 · commit a58fbefe7f5f · 2015-06-16T08:10:59.000-05:00
Fix exception when merging with empty commit message
diff --git a/github3/pulls.py b/github3/pulls.py
@@ -313,9 +313,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)
         if not json:
diff --git a/tests/unit/test_pulls.py b/tests/unit/test_pulls.py
@@ -67,7 +67,9 @@ def test_merge(self):
         """Show that a user can merge a Pull Request."""
         self.instance.merge()
 
-        self.session.put.assert_called_once_with(url_for('merge'), data=None)
+        self.session.put.assert_called_once_with(
+	    url_for('merge'),
+	    data='{"commit_message": ""}')
 
     def test_patch(self):
         """Show that a user can fetch the patch from a Pull Request."""
