OLD | NEW |
| (Empty) |
1 diff --git a/third_party/google_api_python_client/apiclient/__init__.py b/third_
party/google_api_python_client/apiclient/__init__.py | |
2 index 5efb142..acb1a23 100644 | |
3 --- a/third_party/google_api_python_client/apiclient/__init__.py | |
4 +++ b/third_party/google_api_python_client/apiclient/__init__.py | |
5 @@ -3,7 +3,7 @@ | |
6 import googleapiclient | |
7 | |
8 try: | |
9 - import oauth2client | |
10 + from third_party import oauth2client | |
11 except ImportError: | |
12 raise RuntimeError( | |
13 'Previous version of google-api-python-client detected; due to a ' | |
14 diff --git a/third_party/google_api_python_client/googleapiclient/channel.py b/t
hird_party/google_api_python_client/googleapiclient/channel.py | |
15 index 68a3b89..4626094 100644 | |
16 --- a/third_party/google_api_python_client/googleapiclient/channel.py | |
17 +++ b/third_party/google_api_python_client/googleapiclient/channel.py | |
18 @@ -60,7 +60,7 @@ import datetime | |
19 import uuid | |
20 | |
21 from googleapiclient import errors | |
22 -from ...oauth2client import util | |
23 +from third_party.oauth2client import util | |
24 | |
25 | |
26 # The unix time epoch starts at midnight 1970. | |
27 diff --git a/third_party/google_api_python_client/googleapiclient/discovery.py b
/third_party/google_api_python_client/googleapiclient/discovery.py | |
28 index 3ddac57..0e9e5cf 100644 | |
29 --- a/third_party/google_api_python_client/googleapiclient/discovery.py | |
30 +++ b/third_party/google_api_python_client/googleapiclient/discovery.py | |
31 @@ -47,9 +47,9 @@ except ImportError: | |
32 from cgi import parse_qsl | |
33 | |
34 # Third-party imports | |
35 -from ... import httplib2 | |
36 +from third_party import httplib2 | |
37 +from third_party.uritemplate import uritemplate | |
38 import mimeparse | |
39 -from ... import uritemplate | |
40 | |
41 # Local imports | |
42 from googleapiclient.errors import HttpError | |
43 @@ -65,9 +65,9 @@ from googleapiclient.model import JsonModel | |
44 from googleapiclient.model import MediaModel | |
45 from googleapiclient.model import RawModel | |
46 from googleapiclient.schema import Schemas | |
47 -from oauth2client.client import GoogleCredentials | |
48 -from oauth2client.util import _add_query_parameter | |
49 -from oauth2client.util import positional | |
50 +from third_party.oauth2client.client import GoogleCredentials | |
51 +from third_party.oauth2client.util import _add_query_parameter | |
52 +from third_party.oauth2client.util import positional | |
53 | |
54 | |
55 # The client library requires a version of httplib2 that supports RETRIES. | |
56 diff --git a/third_party/google_api_python_client/googleapiclient/errors.py b/th
ird_party/google_api_python_client/googleapiclient/errors.py | |
57 index a1999fd..18c52e6 100644 | |
58 --- a/third_party/google_api_python_client/googleapiclient/errors.py | |
59 +++ b/third_party/google_api_python_client/googleapiclient/errors.py | |
60 @@ -24,7 +24,7 @@ __author__ = 'jcgregorio@google.com (Joe Gregorio)' | |
61 | |
62 import json | |
63 | |
64 -from ...oauth2client import util | |
65 +from third_party.oauth2client import util | |
66 | |
67 | |
68 class Error(Exception): | |
69 diff --git a/third_party/google_api_python_client/googleapiclient/http.py b/thir
d_party/google_api_python_client/googleapiclient/http.py | |
70 index 8638279..d2ce70c 100644 | |
71 --- a/third_party/google_api_python_client/googleapiclient/http.py | |
72 +++ b/third_party/google_api_python_client/googleapiclient/http.py | |
73 @@ -25,7 +25,6 @@ import StringIO | |
74 import base64 | |
75 import copy | |
76 import gzip | |
77 -import httplib2 | |
78 import json | |
79 import logging | |
80 import mimeparse | |
81 @@ -49,7 +48,8 @@ from errors import ResumableUploadError | |
82 from errors import UnexpectedBodyError | |
83 from errors import UnexpectedMethodError | |
84 from model import JsonModel | |
85 -from ...oauth2client import util | |
86 +from third_party import httplib2 | |
87 +from third_party.oauth2client import util | |
88 | |
89 | |
90 DEFAULT_CHUNK_SIZE = 512*1024 | |
91 diff --git a/third_party/google_api_python_client/googleapiclient/sample_tools.p
y b/third_party/google_api_python_client/googleapiclient/sample_tools.py | |
92 index cbd6d6f..cc0790b 100644 | |
93 --- a/third_party/google_api_python_client/googleapiclient/sample_tools.py | |
94 +++ b/third_party/google_api_python_client/googleapiclient/sample_tools.py | |
95 @@ -22,13 +22,13 @@ __all__ = ['init'] | |
96 | |
97 | |
98 import argparse | |
99 -import httplib2 | |
100 import os | |
101 | |
102 from googleapiclient import discovery | |
103 -from ...oauth2client import client | |
104 -from ...oauth2client import file | |
105 -from ...oauth2client import tools | |
106 +from third_party import httplib2 | |
107 +from third_party.oauth2client import client | |
108 +from third_party.oauth2client import file | |
109 +from third_party.oauth2client import tools | |
110 | |
111 | |
112 def init(argv, name, version, doc, filename, scope=None, parents=[], discovery_
filename=None): | |
113 diff --git a/third_party/google_api_python_client/googleapiclient/schema.py b/th
ird_party/google_api_python_client/googleapiclient/schema.py | |
114 index af41317..92543ec 100644 | |
115 --- a/third_party/google_api_python_client/googleapiclient/schema.py | |
116 +++ b/third_party/google_api_python_client/googleapiclient/schema.py | |
117 @@ -63,7 +63,7 @@ __author__ = 'jcgregorio@google.com (Joe Gregorio)' | |
118 | |
119 import copy | |
120 | |
121 -from oauth2client import util | |
122 +from third_party.oauth2client import util | |
123 | |
124 | |
125 class Schemas(object): | |
OLD | NEW |