Fix Firefox download mechanism.

download_firefox_nightly.py

 #!/usr/bin/env python
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Downloads a Firefox Nightly build for the current platform."""
 
 import datetime
 import glob
 import os
 import shutil
 import sys
 import subprocess
 import tarfile
 import time
 import zipfile
 
 from optparse import OptionParser
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 THIRD_PARTY_DIR = os.path.abspath(os.path.join(BASE_DIR, 'third_party'))
 
+sys.path.append(os.path.join(THIRD_PARTY_DIR, 'requests'))

[kjellander_chromium, 2015/11/18 06:53:50]

nit: sort alphabetically

[phoglund_chromium, 2015/11/18 14:03:37]

Done.

 sys.path.append(os.path.join(THIRD_PARTY_DIR, 'mozdownload'))
 sys.path.append(os.path.join(THIRD_PARTY_DIR, 'mozinfo'))
 
 from mozdownload import scraper

[kjellander_chromium, 2015/11/18 06:53:50]

nit: sort alphabetically

[phoglund_chromium, 2015/11/18 14:03:37]

Done.

+from mozdownload import errors
 import utils
 
 
 def _Touch(a_file):
   with open(a_file, 'a'):
     os.utime(a_file, None)
 
 
 def _GetFirefoxArchivesSortedOnModifiedDate(target_dir):
   firefox_archives = glob.glob(os.path.join(target_dir, '*tar.bz2'))
@@ skipping 26 matching lines @@
 
   newest_build = firefox_archives[0]
   build_age_seconds = time.time() - os.path.getmtime(newest_build)
   build_age_days = datetime.timedelta(seconds=build_age_seconds).days
 
   return newest_build, build_age_days
 
 
 def _MaybeDownload(target_dir, force):
   try:
-    downloader = scraper.DailyScraper(directory=target_dir, version=None)
+    downloader = scraper.DailyScraper(destination=target_dir)
     filename = downloader.build_filename(downloader.binary)
     firefox_archive = os.path.join(target_dir, filename)
 
     if os.path.exists(firefox_archive) and not force:
       # Touch the file anyway since we were 'successful', so we can accurately
       # compute the age of the most recent download attempt and act accordingly
       # when a download fails later.
       _Touch(firefox_archive)
       print 'Skipping download as %s is already downloaded.' % firefox_archive
       return None
 
     downloader.download()
     print 'Downloaded %s' % firefox_archive
     return firefox_archive
-  except scraper.NotFoundException as exception:
+  except errors.NotFoundError as exception:
     print 'Failed to download firefox: %s.' % exception
     fallback_build, age_days = _FindFallbackFirefoxBuild(target_dir)
 
     if not fallback_build:
       raise Exception('We failed to download Firefox and we have no builds to '
                       'fall back on; failing...')
     if age_days > 3:
       raise Exception('We have failed to download firefox builds for more '
                       'than 3 days now: failing so someone looks at it. The '
                       'most recent build we have is %d days old.' % age_days)
@@ skipping 38 matching lines @@
 
   firefox_archive = _MaybeDownload(target_dir, options.force)
   if firefox_archive:
     _ExtractArchive(firefox_archive, target_dir) 
 
   if options.clean_old_firefox_archives:
     _CleanOldFirefoxArchives(target_dir)
 
 if __name__ == '__main__':
   sys.exit(main())