Make transport private, remove usage of get_http_object #660

theacodes · 2016-09-27T00:42:14Z

It's broken into 3 separate commits on purpose. The first makes transport private and removes get_http_object, the next two fix everything that breaks when that happens.

oauth2client/_transport/__init__.py

+    urllib3 = None
+
+# The available transports, in order of priority.
+_TRANSPORTS = tuple(filter(None, (urllib3, httplib2,)))


oauth2client/_transport/__init__.py

+try:
+    from oauth2client._transport import urllib3
+except ImportError:  # pragma: NO COVER
+    urllib3 = None


oauth2client/_transport/__init__.py

+        ValueError: if no transport can be found for the object.
+    """
+    for transport in _TRANSPORTS:
+        if isinstance(http_object, transport.HTTP_OBJECT_CLASSES):


oauth2client/_transport/__init__.py

+    if http_object is None:
+        http_object = _get_preferred_http_object()
+
+    transport = _transport_for_http_object(http_object)


oauth2client/_transport/httplib2.py

+        response, data = http.request(
+            uri, method=method, body=body, headers=headers, **kwargs)
+    finally:
+        http.timeout = original_timeout


oauth2client/contrib/appengine.py

        """
-        return self.credentials.authorize(
-            transport.get_http_object(*args, **kwargs))
+        return self.credentials.authorize(http)


oauth2client/contrib/appengine.py

        """Returns an authorized http instance.

        Must only be called from within an @oauth_required decorated method, or
        from within an @oauth_aware decorated method where has_credentials()
        returns True.
-
-        Args:


oauth2client/contrib/flask_util.py

        """Returns an authorized http instance.

        Can only be called if there are valid credentials for the user, such
        as inside of a view that is decorated with @required.

-        Args:


tests/conftest.py

+# Make HttpMock instances use the httplib2 transport.
+httplib2.HTTP_OBJECT_CLASSES = (
+    (http_mock.HttpMock, http_mock.HttpMockSequence) +
+    httplib2.HTTP_OBJECT_CLASSES)


oauth2client/contrib/django_util/__init__.py

@@ -481,9 +480,8 @@ def credentials(self):
        """Gets the authorized credentials for this flow, if they exist."""
        return _credentials_from_request(self.request)

-    @property


dhermes · 2016-09-27T23:01:15Z

LGTM

theacodes · 2016-09-27T23:05:25Z

Merging with admission of the following:

I really want to remove any uses of patching _get_preferred_http_object except for the gce check. HTTP should be required everywhere.
The outcome of the conversation over at Internal transport discussion google-auth-library-python#1 will likely have some bearing as to where I take this.

Jon Wayne Parrott added 3 commits September 26, 2016 17:38

Make transport private, fix interface inconsistencies

597e4ad

Fix docs

489fcd3

Fix everything that broke

d6c8d67

theacodes assigned dhermes Sep 27, 2016

googlebot added the cla: yes label Sep 27, 2016

dhermes reviewed Sep 27, 2016

View reviewed changes

Address review comments

2272125

theacodes merged commit d4950a6 into googleapis:transport-refactor Sep 27, 2016

theacodes deleted the transport-refactor-private branch September 27, 2016 23:05

google-admin unassigned dhermes Sep 11, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make transport private, remove usage of get_http_object #660

Make transport private, remove usage of get_http_object #660

theacodes commented Sep 27, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

dhermes commented Sep 27, 2016

theacodes commented Sep 27, 2016

Make transport private, remove usage of get_http_object #660

Make transport private, remove usage of get_http_object #660

Conversation

theacodes commented Sep 27, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

dhermes commented Sep 27, 2016

theacodes commented Sep 27, 2016