Be more permissive about GAE SDK versions.
Previously, we always tried to grab the *most* recent SDK version for building docs; this change loosens this, to grab the most-recent-and-readable version.
This commit is contained in:
@@ -34,11 +34,11 @@ def _version_tuple(v):
|
|||||||
version_string = os.path.splitext(v['name'])[0].rpartition('_')[2]
|
version_string = os.path.splitext(v['name'])[0].rpartition('_')[2]
|
||||||
return tuple(int(x) for x in version_string.split('.'))
|
return tuple(int(x) for x in version_string.split('.'))
|
||||||
|
|
||||||
def get_sdk_url(sdk_versions):
|
def get_sdk_urls(sdk_versions):
|
||||||
python_releases = [v for v in sdk_versions
|
python_releases = [v for v in sdk_versions
|
||||||
if v['name'].startswith('featured/google_appengine')]
|
if v['name'].startswith('featured/google_appengine')]
|
||||||
current_release = sorted(python_releases, key=_version_tuple)[-1]
|
current_releases = sorted(python_releases, key=_version_tuple, reverse=True)
|
||||||
return current_release['mediaLink']
|
return [release['mediaLink'] for release in current_releases]
|
||||||
|
|
||||||
def main(argv):
|
def main(argv):
|
||||||
if len(argv) > 2:
|
if len(argv) > 2:
|
||||||
@@ -56,11 +56,15 @@ def main(argv):
|
|||||||
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_url = get_sdk_url(sdk_versions)
|
sdk_urls = get_sdk_urls(sdk_versions)
|
||||||
try:
|
for sdk_url in sdk_urls:
|
||||||
sdk_contents = StringIO.StringIO(urllib2.urlopen(sdk_url).read())
|
try:
|
||||||
except:
|
sdk_contents = StringIO.StringIO(urllib2.urlopen(sdk_url).read())
|
||||||
print 'Could not read SDK from', sdk_url
|
break
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
print 'Could not read SDK from any of ', sdk_urls
|
||||||
return 1
|
return 1
|
||||||
sdk_contents.seek(0)
|
sdk_contents.seek(0)
|
||||||
try:
|
try:
|
||||||
|
|||||||
Reference in New Issue
Block a user