third_party/oauth2client/MODIFICATIONS.diff - Issue 1074673002: Add OAuth2 support for end users (i.e. 3-legged flow with the browser).

Side by Side Diff: third_party/oauth2client/MODIFICATIONS.diff

Issue 1074673002: Add OAuth2 support for end users (i.e. 3-legged flow with the browser). (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: windows lineendings for depot-tools-auth.bat Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 diff --git a/third_party/oauth2client/client.py b/third_party/oauth2client/clien t.py	1 diff --git a/third_party/oauth2client/client.py b/third_party/oauth2client/clien t.py

2 index 4e8e616..6901f3f 100644	2 index 4e8e616..6901f3f 100644

3 --- a/third_party/oauth2client/client.py	3 --- a/third_party/oauth2client/client.py

4 +++ b/third_party/oauth2client/client.py	4 +++ b/third_party/oauth2client/client.py

5 @@ -23,24 +23,23 @@ import base64	5 @@ -23,24 +23,23 @@ import base64

6 import clientsecrets	6 import clientsecrets

7 import copy	7 import copy

8 import datetime	8 import datetime

9 -import httplib2	9 -import httplib2

10 +from .. import httplib2	10 +from .. import httplib2

11 import logging	11 import logging

12 -import os	12 -import os

13 import sys	13 import sys

14 import time	14 import time

15 import urllib	15 import urllib

16 import urlparse	16 import urlparse

17	17

18 -from oauth2client import GOOGLE_AUTH_URI	18 -from oauth2client import GOOGLE_AUTH_URI

19 -from oauth2client import GOOGLE_REVOKE_URI	19 -from oauth2client import GOOGLE_REVOKE_URI

20 -from oauth2client import GOOGLE_TOKEN_URI	20 -from oauth2client import GOOGLE_TOKEN_URI

21 -from oauth2client import util	21 -from oauth2client import util

22 -from oauth2client.anyjson import simplejson	22 -from oauth2client.anyjson import simplejson

23 +from . import GOOGLE_AUTH_URI	23 +from . import GOOGLE_AUTH_URI

24 +from . import GOOGLE_REVOKE_URI	24 +from . import GOOGLE_REVOKE_URI

25 +from . import GOOGLE_TOKEN_URI	25 +from . import GOOGLE_TOKEN_URI

26 +from . import util	26 +from . import util

27 +from .anyjson import simplejson	27 +from .anyjson import simplejson

28	28

29 HAS_OPENSSL = False	29 HAS_OPENSSL = False

30 HAS_CRYPTO = False	30 HAS_CRYPTO = False

31 try:	31 try:

32 - from oauth2client import crypt	32 - from oauth2client import crypt

33 + from . import crypt	33 + from . import crypt

34 HAS_CRYPTO = True	34 HAS_CRYPTO = True

35 if crypt.OpenSSLVerifier is not None:	35 if crypt.OpenSSLVerifier is not None:

36 HAS_OPENSSL = True	36 HAS_OPENSSL = True

	37 diff --git a/third_party/oauth2client/locked_file.py b/third_party/oauth2client/ locked_file.py

	38 index 31514dc..858b702 100644

	39 --- a/third_party/oauth2client/locked_file.py

	40 +++ b/third_party/oauth2client/locked_file.py

	41 @@ -35,7 +35,7 @@ import logging

	42 import os

	43 import time

	44

	45 -from oauth2client import util

	46 +from . import util

	47

	48 logger = logging.getLogger(__name__)

	49

	50 diff --git a/third_party/oauth2client/multistore_file.py b/third_party/oauth2cli ent/multistore_file.py

	51 index ce7a519..ea89027 100644

	52 --- a/third_party/oauth2client/multistore_file.py

	53 +++ b/third_party/oauth2client/multistore_file.py

	54 @@ -50,9 +50,9 @@ import os

	55 import threading

	56

	57 from anyjson import simplejson

	58 -from oauth2client.client import Storage as BaseStorage

	59 -from oauth2client.client import Credentials

	60 -from oauth2client import util

	61 +from .client import Storage as BaseStorage

	62 +from .client import Credentials

	63 +from . import util

	64 from locked_file import LockedFile

	65

	66 logger = logging.getLogger(__name__)

OLD	NEW

« no previous file with comments | « tests/git_cl_test.py ('k') | third_party/oauth2client/locked_file.py » ('j') | no next file with comments »