chore: Update Python versions, remove six (#111)

* Update Python versions, remove six

Author: jay0lee

google_auth_httplib2.py

@@ -16,12 +16,12 @@
 
 from __future__ import absolute_import
 
+import http.client
 import logging
 
 from google.auth import exceptions
 from google.auth import transport
 import httplib2
-from six.moves import http_client
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -122,7 +122,7 @@ def __call__(
             return _Response(response, data)
         # httplib2 should catch the lower http error, this is a bug and
         # needs to be fixed there.  Catch the error for the meanwhile.
-        except (httplib2.HttpLib2Error, http_client.HTTPException) as exc:
+        except (httplib2.HttpLib2Error, http.client.HTTPException) as exc:
             raise exceptions.TransportError(exc)
 
 

noxfile.py

@@ -27,7 +27,7 @@
 ]
 
 DEFAULT_PYTHON_VERSION = "3.8"
-UNIT_TEST_PYTHON_VERSIONS = ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+UNIT_TEST_PYTHON_VERSIONS = ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
 
 
 @nox.session(python=DEFAULT_PYTHON_VERSION)

pylint.config.py

@@ -45,7 +45,7 @@
         'function-rgx': '[a-z_][a-z0-9_]{2,40}$',
     },
     'TYPECHECK': {
-        'ignored-modules': ['six', 'google.protobuf'],
+        'ignored-modules': ['google.protobuf'],
     },
     'DESIGN': {
         'min-public-methods': '0',

setup.py

@@ -18,7 +18,7 @@
 
 version = "0.1.0"
 
-DEPENDENCIES = ["google-auth", "httplib2 >= 0.15.0", "six"]
+DEPENDENCIES = ["google-auth", "httplib2 >= 0.15.0"]
 
 
 with io.open("README.rst", "r") as fh:
@@ -38,13 +38,13 @@
     license="Apache 2.0",
     keywords="google auth oauth client",
     classifiers=[
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Apache Software License",

tests/compliance.py

@@ -12,11 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import http.client
+
 import flask
 from google.auth import exceptions
 import pytest
 from pytest_localserver.http import WSGIServer
-from six.moves import http_client
 
 # .invalid will never resolve, see https://tools.ietf.org/html/rfc2606
 NXDOMAIN = "test.invalid"
@@ -40,11 +41,11 @@ def server(self):
         def index():
             header_value = flask.request.headers.get("x-test-header", "value")
             headers = {"X-Test-Header": header_value}
-            return "Basic Content", http_client.OK, headers
+            return "Basic Content", http.client.OK, headers
 
         @app.route("/server_error")
         def server_error():
-            return "Error", http_client.INTERNAL_SERVER_ERROR
+            return "Error", http.client.INTERNAL_SERVER_ERROR
 
         # pylint: enable=unused-variable
 
@@ -57,15 +58,15 @@ def test_request_basic(self, server):
         request = self.make_request()
         response = request(url=server.url + "/basic", method="GET")
 
-        assert response.status == http_client.OK
+        assert response.status == http.client.OK
         assert response.headers["x-test-header"] == "value"
         assert response.data == b"Basic Content"
 
     def test_request_timeout(self, server):
         request = self.make_request()
         response = request(url=server.url + "/basic", method="GET", timeout=2)
 
-        assert response.status == http_client.OK
+        assert response.status == http.client.OK
         assert response.headers["x-test-header"] == "value"
         assert response.data == b"Basic Content"
 
@@ -77,15 +78,15 @@ def test_request_headers(self, server):
             headers={"x-test-header": "hello world"},
         )
 
-        assert response.status == http_client.OK
+        assert response.status == http.client.OK
         assert response.headers["x-test-header"] == "hello world"
         assert response.data == b"Basic Content"
 
     def test_request_error(self, server):
         request = self.make_request()
         response = request(url=server.url + "/server_error", method="GET")
 
-        assert response.status == http_client.INTERNAL_SERVER_ERROR
+        assert response.status == http.client.INTERNAL_SERVER_ERROR
         assert response.data == b"Error"
 
     def test_connection_error(self):

tests/test_google_auth_httplib2.py

@@ -12,10 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import http.client
+import io
+
 import httplib2
 import mock
-import six
-from six.moves import http_client
 
 import google_auth_httplib2
 from tests import compliance
@@ -44,7 +45,7 @@ def request(
 
 
 class MockResponse(object):
-    def __init__(self, status=http_client.OK, data=b""):
+    def __init__(self, status=http.client.OK, data=b""):
         self.status = status
         self.data = data
 
@@ -180,10 +181,10 @@ def test_request_no_refresh(self):
 
     def test_request_refresh(self):
         mock_credentials = mock.Mock(wraps=MockCredentials())
-        mock_final_response = MockResponse(status=http_client.OK)
+        mock_final_response = MockResponse(status=http.client.OK)
         # First request will 401, second request will succeed.
         mock_http = MockHttp(
-            [MockResponse(status=http_client.UNAUTHORIZED), mock_final_response]
+            [MockResponse(status=http.client.UNAUTHORIZED), mock_final_response]
         )
 
         authed_http = google_auth_httplib2.AuthorizedHttp(
@@ -220,10 +221,10 @@ def test_request_stream_body(self):
         mock_response = MockResponse()
         # Refresh is needed to cover the resetting of the body position.
         mock_http = MockHttp(
-            [MockResponse(status=http_client.UNAUTHORIZED), mock_response]
+            [MockResponse(status=http.client.UNAUTHORIZED), mock_response]
         )
 
-        body = six.StringIO("body")
+        body = io.StringIO("body")
         body.seek(1)
 
         authed_http = google_auth_httplib2.AuthorizedHttp(