Remove client_id/client_secret authentication

github/MainClass.py

@@ -50,7 +50,6 @@
 import datetime
 import pickle
 import time
-import warnings
 
 import jwt
 import requests
@@ -100,8 +99,6 @@ def __init__(
         jwt=None,
         base_url=DEFAULT_BASE_URL,
         timeout=DEFAULT_TIMEOUT,
-        client_id=None,
-        client_secret=None,
         user_agent="PyGithub/Python",
         per_page=DEFAULT_PER_PAGE,
         verify=True,
@@ -113,8 +110,6 @@ def __init__(
         :param password: string
         :param base_url: string
         :param timeout: integer
-        :param client_id: string
-        :param client_secret: string
         :param user_agent: string
         :param per_page: int
         :param verify: boolean or string
@@ -127,30 +122,19 @@ def __init__(
         assert jwt is None or isinstance(jwt, str), jwt
         assert isinstance(base_url, str), base_url
         assert isinstance(timeout, int), timeout
-        assert client_id is None or isinstance(client_id, str), client_id
-        assert client_secret is None or isinstance(client_secret, str), client_secret
         assert user_agent is None or isinstance(user_agent, str), user_agent
         assert (
             retry is None
             or isinstance(retry, (int))
             or isinstance(retry, (urllib3.util.Retry))
         )
         assert pool_size is None or isinstance(pool_size, (int)), pool_size
-
-        if client_id is not None or client_secret is not None:
-            warnings.warn(
-                "client_id and client_secret are deprecated and will be removed in a future release, switch to token authentication",
-                FutureWarning,
-                stacklevel=2,
-            )
         self.__requester = Requester(
             login_or_token,
             password,
             jwt,
             base_url,
             timeout,
-            client_id,
-            client_secret,
             user_agent,
             per_page,
             verify,

github/Requester.py

@@ -296,8 +296,6 @@ def __init__(
         jwt,
         base_url,
         timeout,
-        client_id,
-        client_secret,
         user_agent,
         per_page,
         verify,
@@ -344,9 +342,6 @@ def __init__(
 
         self.oauth_scopes = None
 
-        self.__clientId = client_id
-        self.__clientSecret = client_secret
-
         assert user_agent is not None, (
             "github now requires a user-agent. "
             "See http://developer.github.com/v3/#user-agent-required"
@@ -581,9 +576,6 @@ def __requestRaw(self, cnx, verb, url, requestHeaders, input):
         return status, responseHeaders, output
 
     def __authenticate(self, url, requestHeaders, parameters):
-        if self.__clientId and self.__clientSecret and "client_id=" not in url:
-            parameters["client_id"] = self.__clientId
-            parameters["client_secret"] = self.__clientSecret
         if self.__authorizationHeader is not None:
             requestHeaders["Authorization"] = self.__authorizationHeader
 

tests/Authentication.py

@@ -26,8 +26,6 @@
 #                                                                              #
 ################################################################################
 
-import warnings
-
 import github
 
 from . import Framework
@@ -50,18 +48,6 @@ def testJWTAuthentication(self):
         g = github.Github(jwt=self.jwt)
         self.assertEqual(g.get_user("jacquev6").name, "Vincent Jacques")
 
-    # Warning: I don't have a secret key, so the requests for this test are forged
-    def testSecretKeyAuthentication(self):
-        # Ignore the warning since client_{id,secret} are deprecated
-        warnings.filterwarnings("ignore", category=FutureWarning)
-        g = github.Github(client_id=self.client_id, client_secret=self.client_secret)
-        self.assertListKeyEqual(
-            g.get_organization("BeaverSoftware").get_repos("public"),
-            lambda r: r.name,
-            ["FatherBeaver", "PyGithub"],
-        )
-        warnings.resetwarnings()
-
     def testUserAgent(self):
         g = github.Github(user_agent="PyGithubTester")
         self.assertEqual(g.get_user("jacquev6").name, "Vincent Jacques")

tests/Framework.py

@@ -268,9 +268,6 @@ def setUp(self):
             self.password = GithubCredentials.password
             self.oauth_token = GithubCredentials.oauth_token
             self.jwt = GithubCredentials.jwt
-            # @todo Remove client_id and client_secret from ReplayData (as we already remove login, password and oauth_token)
-            # self.client_id = GithubCredentials.client_id
-            # self.client_secret = GithubCredentials.client_secret
         else:
             github.Requester.Requester.injectConnectionClasses(
                 lambda ignored, *args, **kwds: ReplayingHttpConnection(
@@ -283,8 +280,6 @@ def setUp(self):
             self.login = "login"
             self.password = "password"
             self.oauth_token = "oauth_token"
-            self.client_id = "client_id"
-            self.client_secret = "client_secret"
             self.jwt = "jwt"
 
             httpretty.enable(allow_net_connect=False)