Revert of Upgrade 3rd packages

third_party/google_api_python_client/MODIFICATIONS.diff

Index: third_party/google_api_python_client/MODIFICATIONS.diff
diff --git a/third_party/google_api_python_client/MODIFICATIONS.diff b/third_party/google_api_python_client/MODIFICATIONS.diff
deleted file mode 100644
index efa382abf2b67c2c1cebf8697dcf6334769c6645..0000000000000000000000000000000000000000
--- a/third_party/google_api_python_client/MODIFICATIONS.diff
+++ /dev/null
@@ -1,125 +0,0 @@
-diff --git a/third_party/google_api_python_client/apiclient/__init__.py b/third_party/google_api_python_client/apiclient/__init__.py
-index 5efb142..acb1a23 100644
---- a/third_party/google_api_python_client/apiclient/__init__.py
-+++ b/third_party/google_api_python_client/apiclient/__init__.py
-@@ -3,7 +3,7 @@
- import googleapiclient
- 
- try:
--  import oauth2client
-+  from third_party import oauth2client
- except ImportError:
-   raise RuntimeError(
-       'Previous version of google-api-python-client detected; due to a '
-diff --git a/third_party/google_api_python_client/googleapiclient/channel.py b/third_party/google_api_python_client/googleapiclient/channel.py
-index 68a3b89..4626094 100644
---- a/third_party/google_api_python_client/googleapiclient/channel.py
-+++ b/third_party/google_api_python_client/googleapiclient/channel.py
-@@ -60,7 +60,7 @@ import datetime
- import uuid
- 
- from googleapiclient import errors
--from ...oauth2client import util
-+from third_party.oauth2client import util
- 
- 
- # The unix time epoch starts at midnight 1970.
-diff --git a/third_party/google_api_python_client/googleapiclient/discovery.py b/third_party/google_api_python_client/googleapiclient/discovery.py
-index 3ddac57..0e9e5cf 100644
---- a/third_party/google_api_python_client/googleapiclient/discovery.py
-+++ b/third_party/google_api_python_client/googleapiclient/discovery.py
-@@ -47,9 +47,9 @@ except ImportError:
-   from cgi import parse_qsl
- 
- # Third-party imports
--from ... import httplib2
-+from third_party import httplib2
-+from third_party.uritemplate import uritemplate
- import mimeparse
--from ... import uritemplate
- 
- # Local imports
- from googleapiclient.errors import HttpError
-@@ -65,9 +65,9 @@ from googleapiclient.model import JsonModel
- from googleapiclient.model import MediaModel
- from googleapiclient.model import RawModel
- from googleapiclient.schema import Schemas
--from oauth2client.client import GoogleCredentials
--from oauth2client.util import _add_query_parameter
--from oauth2client.util import positional
-+from third_party.oauth2client.client import GoogleCredentials
-+from third_party.oauth2client.util import _add_query_parameter
-+from third_party.oauth2client.util import positional
- 
- 
- # The client library requires a version of httplib2 that supports RETRIES.
-diff --git a/third_party/google_api_python_client/googleapiclient/errors.py b/third_party/google_api_python_client/googleapiclient/errors.py
-index a1999fd..18c52e6 100644
---- a/third_party/google_api_python_client/googleapiclient/errors.py
-+++ b/third_party/google_api_python_client/googleapiclient/errors.py
-@@ -24,7 +24,7 @@ __author__ = 'jcgregorio@google.com (Joe Gregorio)'
- 
- import json
- 
--from ...oauth2client import util
-+from third_party.oauth2client import util
- 
- 
- class Error(Exception):
-diff --git a/third_party/google_api_python_client/googleapiclient/http.py b/third_party/google_api_python_client/googleapiclient/http.py
-index 8638279..d2ce70c 100644
---- a/third_party/google_api_python_client/googleapiclient/http.py
-+++ b/third_party/google_api_python_client/googleapiclient/http.py
-@@ -25,7 +25,6 @@ import StringIO
- import base64
- import copy
- import gzip
--import httplib2
- import json
- import logging
- import mimeparse
-@@ -49,7 +48,8 @@ from errors import ResumableUploadError
- from errors import UnexpectedBodyError
- from errors import UnexpectedMethodError
- from model import JsonModel
--from ...oauth2client import util
-+from third_party import httplib2
-+from third_party.oauth2client import util
- 
- 
- DEFAULT_CHUNK_SIZE = 512*1024
-diff --git a/third_party/google_api_python_client/googleapiclient/sample_tools.py b/third_party/google_api_python_client/googleapiclient/sample_tools.py
-index cbd6d6f..cc0790b 100644
---- a/third_party/google_api_python_client/googleapiclient/sample_tools.py
-+++ b/third_party/google_api_python_client/googleapiclient/sample_tools.py
-@@ -22,13 +22,13 @@ __all__ = ['init']
- 
- 
- import argparse
--import httplib2
- import os
- 
- from googleapiclient import discovery
--from ...oauth2client import client
--from ...oauth2client import file
--from ...oauth2client import tools
-+from third_party import httplib2
-+from third_party.oauth2client import client
-+from third_party.oauth2client import file
-+from third_party.oauth2client import tools
- 
- 
- def init(argv, name, version, doc, filename, scope=None, parents=[], discovery_filename=None):
-diff --git a/third_party/google_api_python_client/googleapiclient/schema.py b/third_party/google_api_python_client/googleapiclient/schema.py
-index af41317..92543ec 100644
---- a/third_party/google_api_python_client/googleapiclient/schema.py
-+++ b/third_party/google_api_python_client/googleapiclient/schema.py
-@@ -63,7 +63,7 @@ __author__ = 'jcgregorio@google.com (Joe Gregorio)'
- 
- import copy
- 
--from oauth2client import util
-+from third_party.oauth2client import util
- 
- 
- class Schemas(object):