Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(264)

Side by Side Diff: third_party/google_api_python_client/apiclient/__init__.py

Issue 1085893002: Upgrade 3rd packages (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: rebase 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 | Annotate | Revision Log
OLDNEW
1 """Retain apiclient as an alias for googleapiclient.""" 1 """Retain apiclient as an alias for googleapiclient."""
2 2
3 import googleapiclient 3 import googleapiclient
4 4
5 try: 5 try:
6 import oauth2client 6 from third_party import oauth2client
7 except ImportError: 7 except ImportError:
8 raise RuntimeError( 8 raise RuntimeError(
9 'Previous version of google-api-python-client detected; due to a ' 9 'Previous version of google-api-python-client detected; due to a '
10 'packaging issue, we cannot perform an in-place upgrade. To repair, ' 10 'packaging issue, we cannot perform an in-place upgrade. To repair, '
11 'remove and reinstall this package, along with oauth2client and ' 11 'remove and reinstall this package, along with oauth2client and '
12 'uritemplate. One can do this with pip via\n' 12 'uritemplate. One can do this with pip via\n'
13 ' pip install -I google-api-python-client' 13 ' pip install -I google-api-python-client'
14 ) 14 )
15 15
16 from googleapiclient import channel 16 from googleapiclient import channel
(...skipping 14 matching lines...) Expand all
31 'http': http, 31 'http': http,
32 'mimeparse': mimeparse, 32 'mimeparse': mimeparse,
33 'model': model, 33 'model': model,
34 'sample_tools': sample_tools, 34 'sample_tools': sample_tools,
35 'schema': schema, 35 'schema': schema,
36 } 36 }
37 37
38 import sys 38 import sys
39 for module_name, module in _SUBMODULES.iteritems(): 39 for module_name, module in _SUBMODULES.iteritems():
40 sys.modules['apiclient.%s' % module_name] = module 40 sys.modules['apiclient.%s' % module_name] = module
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698