Always define the session adapter

This represents no change of behaviour, but it enables us to set more
options to the adapter.

Signed-off-by: Amador Pahim <[email protected]>

Author: apahim

github/Requester.py

@@ -90,11 +90,15 @@ def __init__(
         self.timeout = timeout
         self.verify = kwargs.get("verify", True)
         self.session = requests.Session()
-        # Code to support retries
-        if retry:
+
+        if retry is None:
+            self.retry = requests.adapters.DEFAULT_RETRIES
+        else:
             self.retry = retry
-            self.adapter = requests.adapters.HTTPAdapter(max_retries=self.retry)
-            self.session.mount("https://", self.adapter)
+        self.adapter = requests.adapters.HTTPAdapter(
+            max_retries=self.retry,
+        )
+        self.session.mount("https://", self.adapter)
 
     def request(self, verb, url, input, headers):
         self.verb = verb
@@ -130,11 +134,15 @@ def __init__(
         self.timeout = timeout
         self.verify = kwargs.get("verify", True)
         self.session = requests.Session()
-        # Code to support retries
-        if retry:
+
+        if retry is None:
+            self.retry = requests.adapters.DEFAULT_RETRIES
+        else:
             self.retry = retry
-            self.adapter = requests.adapters.HTTPAdapter(max_retries=self.retry)
-            self.session.mount("http://", self.adapter)
+        self.adapter = requests.adapters.HTTPAdapter(
+            max_retries=self.retry,
+        )
+        self.session.mount("http://", self.adapter)
 
     def request(self, verb, url, input, headers):
         self.verb = verb

tests/ReplayData/Retry.testReturnsRepoAfterSettingRetryHttp.txt

@@ -0,0 +1,11 @@
+http
+GET
+my.enterprise.com
+None
+/repos/PyGithub/PyGithub
+{'Authorization': 'Basic login_and_password_removed', 'User-Agent': 'PyGithub/Python'}
+None
+200
+[('Date', 'Fri, 08 Jan 2021 10:42:45 GMT'), ('Content-Type', 'application/json; charset=utf-8'), ('Transfer-Encoding', 'chunked'), ('Server', 'GitHub.com'), ('Status', '200 OK'), ('Cache-Control', 'public, max-age=60, s-maxage=60'), ('Vary', 'Accept, Accept-Encoding, Accept, X-Requested-With, Accept-Encoding'), ('ETag', 'W/"e132b35ca5ec517feb3106720dceb9394b5bf1f333ef886f8c407d3f2d5de3b2"'), ('Last-Modified', 'Fri, 08 Jan 2021 09:41:41 GMT'), ('X-GitHub-Media-Type', 'github.v3; format=json'), ('X-RateLimit-Limit', '60'), ('X-RateLimit-Remaining', '32'), ('X-RateLimit-Reset', '1610104719'), ('X-RateLimit-Used', '28'), ('Access-Control-Expose-Headers', 'ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Used, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type, Deprecation, Sunset'), ('Access-Control-Allow-Origin', '*'), ('Strict-Transport-Security', 'max-age=31536000; includeSubdomains; preload'), ('X-Frame-Options', 'deny'), ('X-Content-Type-Options', 'nosniff'), ('X-XSS-Protection', '1; mode=block'), ('Referrer-Policy', 'origin-when-cross-origin, strict-origin-when-cross-origin'), ('Content-Security-Policy', "default-src 'none'"), ('Content-Encoding', 'gzip'), ('X-GitHub-Request-Id', '9588:CCCC:9EFCE:B6C13:5FF83725')]
+{"id":3544490,"node_id":"MDEwOlJlcG9zaXRvcnkzNTQ0NDkw","name":"PyGithub","full_name":"PyGithub/PyGithub","private":false,"owner":{"login":"PyGithub","id":11288996,"node_id":"MDEyOk9yZ2FuaXphdGlvbjExMjg4OTk2","avatar_url":"https://avatars0.githubusercontent.com/u/11288996?v=4","gravatar_id":"","url":"http://my.enterprise.com/users/PyGithub","html_url":"https://github.com/PyGithub","followers_url":"http://my.enterprise.com/users/PyGithub/followers","following_url":"http://my.enterprise.com/users/PyGithub/following{/other_user}","gists_url":"http://my.enterprise.com/users/PyGithub/gists{/gist_id}","starred_url":"http://my.enterprise.com/users/PyGithub/starred{/owner}{/repo}","subscriptions_url":"http://my.enterprise.com/users/PyGithub/subscriptions","organizations_url":"http://my.enterprise.com/users/PyGithub/orgs","repos_url":"http://my.enterprise.com/users/PyGithub/repos","events_url":"http://my.enterprise.com/users/PyGithub/events{/privacy}","received_events_url":"http://my.enterprise.com/users/PyGithub/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/PyGithub/PyGithub","description":"Typed interactions with the GitHub API v3","fork":false,"url":"http://my.enterprise.com/repos/PyGithub/PyGithub","forks_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/forks","keys_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/keys{/key_id}","collaborators_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/collaborators{/collaborator}","teams_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/teams","hooks_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/hooks","issue_events_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/issues/events{/number}","events_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/events","assignees_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/assignees{/user}","branches_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/branches{/branch}","tags_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/tags","blobs_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/git/blobs{/sha}","git_tags_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/git/tags{/sha}","git_refs_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/git/refs{/sha}","trees_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/git/trees{/sha}","statuses_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/statuses/{sha}","languages_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/languages","stargazers_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/stargazers","contributors_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/contributors","subscribers_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/subscribers","subscription_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/subscription","commits_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/commits{/sha}","git_commits_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/git/commits{/sha}","comments_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/comments{/number}","issue_comment_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/issues/comments{/number}","contents_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/contents/{+path}","compare_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/compare/{base}...{head}","merges_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/merges","archive_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/{archive_format}{/ref}","downloads_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/downloads","issues_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/issues{/number}","pulls_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/pulls{/number}","milestones_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/milestones{/number}","notifications_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/notifications{?since,all,participating}","labels_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/labels{/name}","releases_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/releases{/id}","deployments_url":"http://my.enterprise.com/repos/PyGithub/PyGithub/deployments","created_at":"2012-02-25T12:53:47Z","updated_at":"2021-01-08T09:41:41Z","pushed_at":"2021-01-07T18:49:51Z","git_url":"git://github.com/PyGithub/PyGithub.git","ssh_url":"[email protected]:PyGithub/PyGithub.git","clone_url":"https://github.com/PyGithub/PyGithub.git","svn_url":"https://github.com/PyGithub/PyGithub","homepage":"https://pygithub.readthedocs.io/","size":13251,"stargazers_count":4000,"watchers_count":4000,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":1245,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":82,"license":{"key":"lgpl-3.0","name":"GNU Lesser General Public License v3.0","spdx_id":"LGPL-3.0","url":"http://my.enterprise.com/licenses/lgpl-3.0","node_id":"MDc6TGljZW5zZTEy"},"forks":1245,"open_issues":82,"watchers":4000,"default_branch":"master","temp_clone_token":null,"organization":{"login":"PyGithub","id":11288996,"node_id":"MDEyOk9yZ2FuaXphdGlvbjExMjg4OTk2","avatar_url":"https://avatars0.githubusercontent.com/u/11288996?v=4","gravatar_id":"","url":"http://my.enterprise.com/users/PyGithub","html_url":"https://github.com/PyGithub","followers_url":"http://my.enterprise.com/users/PyGithub/followers","following_url":"http://my.enterprise.com/users/PyGithub/following{/other_user}","gists_url":"http://my.enterprise.com/users/PyGithub/gists{/gist_id}","starred_url":"http://my.enterprise.com/users/PyGithub/starred{/owner}{/repo}","subscriptions_url":"http://my.enterprise.com/users/PyGithub/subscriptions","organizations_url":"http://my.enterprise.com/users/PyGithub/orgs","repos_url":"http://my.enterprise.com/users/PyGithub/repos","events_url":"http://my.enterprise.com/users/PyGithub/events{/privacy}","received_events_url":"http://my.enterprise.com/users/PyGithub/received_events","type":"Organization","site_admin":false},"network_count":1245,"subscribers_count":105}
+

tests/Retry.py

@@ -75,3 +75,14 @@ def testRaisesRetryErrorAfterMaxRetries(self):
         self.assertEqual(len(httpretty.latest_requests), 4)
         for request in httpretty.latest_requests:
             self.assertEqual(request.path, "/repos/PyGithub/PyGithub")
+
+    def testReturnsRepoAfterSettingRetryHttp(self):
+        g = github.Github(
+            self.login,
+            self.password,
+            base_url="http://my.enterprise.com",
+            retry=0,
+        )  # http here
+        repository = g.get_repo(REPO_NAME)
+        self.assertIsInstance(repository, github.Repository.Repository)
+        self.assertEqual(repository.full_name, REPO_NAME)