File tree Expand file tree Collapse file tree 3 files changed +5
-9
lines changed
googleapiclient/discovery_cache Expand file tree Collapse file tree 3 files changed +5
-9
lines changed Original file line number Diff line number Diff line change 3636 try :
3737 from oauth2client .locked_file import LockedFile
3838 except ImportError :
39- # oauth2client > 4.0.0
39+ # oauth2client > 4.0.0 or google-auth
4040 raise ImportError (
41- 'file_cache is unavailable when using oauth2client >= 4.0.0' )
41+ 'file_cache is unavailable when using oauth2client >= 4.0.0 or google-auth ' )
4242
4343from . import base
4444from ..discovery_cache import DISCOVERY_DOC_MAX_AGE
Original file line number Diff line number Diff line change @@ -64,7 +64,8 @@ def _DetectBadness():
6464
6565install_requires = [
6666 'httplib2>=0.9.2,<1dev' ,
67- 'oauth2client>=1.5.0,<5.0.0dev' ,
67+ 'google-auth>=1.4.1' ,
68+ 'google-auth-httplib2>=0.0.3' ,
6869 'six>=1.6.1,<2dev' ,
6970 'uritemplate>=3.0.0,<4dev' ,
7071]
Original file line number Diff line number Diff line change 1616__author__ = '[email protected] (Ali Afshar)' 1717
1818
19- # Oauth2client < 3 has the positional helper in 'util', >= 3 has it
20- # in '_helpers'.
21- try :
22- from oauth2client import util
23- except ImportError :
24- from oauth2client import _helpers as util
19+ from googleapiclient import _helpers as util
2520
2621
2722def setup_package ():
You can’t perform that action at this time.
0 commit comments