Issue 4419 - Use proper API in order to upload devbuilds to AMO

sitescripts/extensions/bin/createNightlies.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2016 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 417 matching lines @@
             })
 
         request = urllib2.Request(upload_url, data=data)
         request.add_header('Content-Type', content_type)
         request.add_header('Authorization', 'JWT ' + token)
         request.get_method = lambda: 'PUT'
 
         try:
             urllib2.urlopen(request).close()
         except urllib2.HTTPError as e:
-            logging.error(e.read())
-            e.close()

[Sebastian Noack, 2016/09/13 15:28:06]

Generally, you should use try-finally (or with statement, however, that is not
supported here) to make sure that the resource gets closed no matter what.

[Wladimir Palant, 2016/09/13 15:45:19]

And here I was hoping that we could avoid obfuscating this code too much...
Done.

+            try:
+                logging.error(e.read())
+            finally:
+                e.close()
             raise
 
     def uploadToChromeWebStore(self):
         # Google APIs use HTTP error codes with error message in body. So we add
         # the response body to the HTTPError to get more meaningful error messages.
 
         class HTTPErrorBodyHandler(urllib2.HTTPDefaultErrorHandler):
             def http_error_default(self, req, fp, code, msg, hdrs):
                 raise urllib2.HTTPError(req.get_full_url(), code, '%s\n%s' % (msg, fp.read()), hdrs, fp)
 
@@ skipping 129 matching lines @@
         except Exception, ex:
             logging.error('The build for %s failed:', repo)
             logging.exception(ex)
 
     file = open(nightlyConfigFile, 'wb')
     nightlyConfig.write(file)
 
 
 if __name__ == '__main__':
     main()