Merge pull request #328 from jayvdb/fetch_gae_sdk-syntax
Syntax fixes for fetch_gae_sdk.
This commit is contained in:
@@ -7,6 +7,7 @@ Usage:
|
|||||||
Current releases are listed here:
|
Current releases are listed here:
|
||||||
https://www.googleapis.com/storage/v1/b/appengine-sdks/o?prefix=featured
|
https://www.googleapis.com/storage/v1/b/appengine-sdks/o?prefix=featured
|
||||||
"""
|
"""
|
||||||
|
from __future__ import print_function
|
||||||
|
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
@@ -48,19 +49,19 @@ def get_sdk_urls(sdk_versions):
|
|||||||
|
|
||||||
def main(argv):
|
def main(argv):
|
||||||
if len(argv) > 2:
|
if len(argv) > 2:
|
||||||
print 'Usage: {} [<destination_dir>]'.format(argv[0])
|
print('Usage: {0} [<destination_dir>]'.format(argv[0]))
|
||||||
return 1
|
return 1
|
||||||
dest_dir = argv[1] if len(argv) > 1 else '.'
|
dest_dir = argv[1] if len(argv) > 1 else '.'
|
||||||
if not os.path.exists(dest_dir):
|
if not os.path.exists(dest_dir):
|
||||||
os.makedirs(dest_dir)
|
os.makedirs(dest_dir)
|
||||||
|
|
||||||
if os.path.exists(os.path.join(dest_dir, 'google_appengine')):
|
if os.path.exists(os.path.join(dest_dir, 'google_appengine')):
|
||||||
print 'GAE SDK already installed at {}, exiting.'.format(dest_dir)
|
print('GAE SDK already installed at {0}, exiting.'.format(dest_dir))
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
sdk_versions = get_gae_versions()
|
sdk_versions = get_gae_versions()
|
||||||
if not sdk_versions:
|
if not sdk_versions:
|
||||||
print 'Error fetching GAE SDK version info'
|
print('Error fetching GAE SDK version info')
|
||||||
return 1
|
return 1
|
||||||
sdk_urls = get_sdk_urls(sdk_versions)
|
sdk_urls = get_sdk_urls(sdk_versions)
|
||||||
for sdk_url in sdk_urls:
|
for sdk_url in sdk_urls:
|
||||||
@@ -70,14 +71,14 @@ def main(argv):
|
|||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
print 'Could not read SDK from any of ', sdk_urls
|
print('Could not read SDK from any of ', sdk_urls)
|
||||||
return 1
|
return 1
|
||||||
sdk_contents.seek(0)
|
sdk_contents.seek(0)
|
||||||
try:
|
try:
|
||||||
zip_contents = zipfile.ZipFile(sdk_contents)
|
zip_contents = zipfile.ZipFile(sdk_contents)
|
||||||
zip_contents.extractall(dest_dir)
|
zip_contents.extractall(dest_dir)
|
||||||
except:
|
except:
|
||||||
print 'Error extracting SDK contents'
|
print('Error extracting SDK contents')
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user