Merge pull request sigmavirus24#630 from AndyMan1/364-backport

sigmavirus24 · web-flow · commit ea95f8315304 · 2016-07-25T08:09:08.000-05:00
Copy pull request sigmavirus24#364 into stable/0.9
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -83,3 +83,4 @@ Contributors
 
 - Lars Holm Nielsen (@larshankat)
 
+- Ryan Pitts (@ryanpitts)
diff --git a/github3/repos/contents.py b/github3/repos/contents.py
@@ -94,10 +94,12 @@ def __ne__(self, other):
         return self.sha != other
 
     @requires_auth
-    def delete(self, message, committer=None, author=None):
+    def delete(self, message, branch=None, committer=None, author=None):
         """Delete this file.
 
         :param str message: (required), commit message to describe the removal
+        :param str branch: (optional), branch where the file exists.
+            Defaults to the default branch of the repository.
         :param dict committer: (optional), if no information is given the
             authenticated user's information will be used. You must specify
             both a name and email.
@@ -109,7 +111,7 @@ def delete(self, message, committer=None, author=None):
         """
         json = None
         if message:
-            data = {'message': message, 'sha': self.sha,
+            data = {'message': message, 'sha': self.sha, 'branch': branch,
                     'committer': validate_commmitter(committer),
                     'author': validate_commmitter(author)}
             self._remove_none(data)
@@ -119,11 +121,14 @@ def delete(self, message, committer=None, author=None):
         return json
 
     @requires_auth
-    def update(self, message, content, committer=None, author=None):
+    def update(self, message, content, branch=None, committer=None,
+               author=None):
         """Update this file.
 
         :param str message: (required), commit message to describe the update
         :param str content: (required), content to update the file with
+        :param str branch: (optional), branch where the file exists.
+            Defaults to the default branch of the repository.
         :param dict committer: (optional), if no information is given the
             authenticated user's information will be used. You must specify
             both a name and email.
@@ -140,7 +145,8 @@ def update(self, message, content, committer=None, author=None):
         json = None
         if message and content:
             content = b64encode(content).decode('utf-8')
-            data = {'message': message, 'content': content, 'sha': self.sha,
+            data = {'message': message, 'content': content, 'branch': branch,
+                    'sha': self.sha,
                     'committer': validate_commmitter(committer),
                     'author': validate_commmitter(author)}
             self._remove_none(data)

Original file line number	Diff line number	Diff line change
`@@ -83,3 +83,4 @@ Contributors`
`83`	`83`
`84`	`84`	`- Lars Holm Nielsen (@larshankat)`
`85`	`85`
	`86`	`+- Ryan Pitts (@ryanpitts)`