master is no longer hard-coded, refs #5

Author: simonw

github_contents.py

@@ -9,12 +9,12 @@ class NotFound(Exception):
     class UnknownError(Exception):
         pass
 
-    def __init__(self, owner, repo, token, branch=None):
+    def __init__(self, owner, repo, token, branch="main"):
         self.owner = owner
         self.repo = repo
         self.token = token
-        self.branch = branch
         self.session = Session()
+        self.branch = branch
 
     def base_url(self):
         return "https://api.github.com/repos/{}/{}".format(self.owner, self.repo)
@@ -42,11 +42,13 @@ def read(self, filepath):
             raise self.UnknownError(response.content)
 
     def read_large(self, filepath):
-        master = self.session.get(
-            self.base_url() + "/git/trees/master?recursive=1", headers=self.headers()
+        "Returns (file_contents_in_bytes, sha1)"
+        default_tree = self.session.get(
+            self.base_url() + "/git/trees/{}?recursive=1".format(self.branch),
+            headers=self.headers(),
         ).json()
         try:
-            tree_entry = [t for t in master["tree"] if t["path"] == filepath][0]
+            tree_entry = [t for t in default_tree["tree"] if t["path"] == filepath][0]
         except IndexError:
             raise self.NotFound(filepath)
         data = self.session.get(tree_entry["url"], headers=self.headers()).json()
@@ -108,15 +110,16 @@ def write_large(self, filepath, content_bytes, commit_message="", committer=None
             },
             headers=self.headers(),
         ).json()
-        # Retrieve master tree sha
-        master_sha = self.session.get(
-            self.base_url() + "/git/trees/master?recursive=1", headers=self.headers()
+        # Retrieve default tree sha
+        default_branch_sha = self.session.get(
+            self.base_url() + "/git/trees/{}?recursive=1".format(self.branch),
+            headers=self.headers(),
         ).json()["sha"]
         # Construct a new tree
         created_tree = self.session.post(
             self.base_url() + "/git/trees",
             json={
-                "base_tree": master_sha,
+                "base_tree": default_branch_sha,
                 "tree": [
                     {
                         "mode": "100644",  # file (blob),
@@ -131,7 +134,7 @@ def write_large(self, filepath, content_bytes, commit_message="", committer=None
         # Create a commit which references the new tree
         payload = {
             "message": commit_message,
-            "parents": [master_sha],
+            "parents": [default_branch_sha],
             "tree": created_tree["sha"],
         }
         if committer:
@@ -141,7 +144,7 @@ def write_large(self, filepath, content_bytes, commit_message="", committer=None
         ).json()
         # Move HEAD reference on master to the new commit
         self.session.patch(
-            self.base_url() + "/git/refs/heads/master",
+            self.base_url() + "/git/refs/heads/{}".format(self.branch),
             json={"sha": created_commit["sha"]},
             headers=self.headers(),
         ).json()

test_github_contents.py

@@ -17,7 +17,7 @@
 
 
 def test_read_small_file():
-    github = GithubContents("simonw", "github-contents-demo", TOKEN)
+    github = GithubContents("simonw", "github-contents-demo", TOKEN, branch="master")
     with Betamax(github.session) as vcr:
         vcr.use_cassette("get-file")
         content, sha = github.read("hello.txt")
@@ -26,7 +26,7 @@ def test_read_small_file():
 
 
 def test_write_small_file():
-    github = GithubContents("simonw", "github-contents-demo", TOKEN)
+    github = GithubContents("simonw", "github-contents-demo", TOKEN, branch="master")
     with Betamax(github.session) as vcr:
         vcr.use_cassette("write-file")
         assert (
@@ -41,7 +41,7 @@ def test_write_small_file():
 
 
 def test_write_large():
-    github = GithubContents("simonw", "github-contents-demo", TOKEN)
+    github = GithubContents("simonw", "github-contents-demo", TOKEN, branch="master")
     with Betamax(github.session) as vcr:
         vcr.use_cassette("write-file-large")
         assert (