Accept sessions in GitHub{,Enterprise,Status}

sigmavirus24 · sigmavirus24 · commit f7ef46542cfa · 2018-04-20T22:30:41.000-05:00
Allow all of our main entry points to accept Sessions customized by the user, especially for the purposes of testing with Betamax. Closes sigmavirus24#699
diff --git a/github3/github.py b/github3/github.py
@@ -56,9 +56,9 @@ class GitHub(models.GitHubCore):
     call the GitHub object with authentication parameters.
     """
 
-    def __init__(self, username='', password='', token=''):
+    def __init__(self, username='', password='', token='', session=None):
         """Create a new GitHub instance to talk to the API."""
-        super(GitHub, self).__init__({}, self.new_session())
+        super(GitHub, self).__init__({}, session or self.new_session())
         if token:
             self.login(username, token=token)
         elif username and password:
@@ -2173,9 +2173,11 @@ class GitHubEnterprise(GitHub):
     override the validation by passing `verify=False`.
     """
 
-    def __init__(self, url, username='', password='', token='', verify=True):
+    def __init__(self, url, username='', password='', token='', verify=True,
+                 session=None):
         """Create a client for a GitHub Enterprise instance."""
-        super(GitHubEnterprise, self).__init__(username, password, token)
+        super(GitHubEnterprise, self).__init__(username, password, token,
+                                               session=session)
         self.session.base_url = url.rstrip('/') + '/api/v3'
         self.session.verify = verify
         self.url = url
@@ -2233,9 +2235,9 @@ class GitHubStatus(models.GitHubCore):
     This will only ever return the JSON objects returned by the API.
     """
 
-    def __init__(self):
+    def __init__(self, session=None):
         """Create a status API client."""
-        super(GitHubStatus, self).__init__({}, self.new_session())
+        super(GitHubStatus, self).__init__({}, session or self.new_session())
         self.session.base_url = 'https://status.github.com'
 
     def _repr(self):
diff --git a/tests/unit/helper.py b/tests/unit/helper.py
@@ -108,10 +108,10 @@ def create_instance_of_described_class(self):
 
         else:
             if self.enterprise_url is None:
-                instance = self.described_class()
+                instance = self.described_class(session=self.session)
             else:
-                instance = self.described_class(self.enterprise_url)
-            instance.session = self.session
+                instance = self.described_class(self.enterprise_url,
+                                                session=self.session)
 
         return instance
 
