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 387 matching lines @@
         }
 
         issued = int(time.time())
         payload = {
             'iss': get_config().get('extensions', 'amo_key'),
             'jti': random.random(),
             'iat': issued,
             'exp': issued + 60,
         }
 
-        input = '.'.join([
+        input = '{}.{}'.format(
             base64.b64encode(json.dumps(header)),
             base64.b64encode(json.dumps(payload))
-        ])
+        )
 
         signature = hmac.new(get_config().get('extensions', 'amo_secret'),
                              msg=input,
                              digestmod=hashlib.sha256).digest()
-        token = '.'.join([input, base64.b64encode(signature)])
-
-        upload_url = ('https://addons.mozilla.org/api/v3/addons/{0}/'
-                      'versions/{1}/').format(self.extensionID, self.version)
-
-        opener = urllib2.build_opener(urllib2.HTTPHandler)
+        token = '{}.{}'.format(input, base64.b64encode(signature))
+
+        upload_url = ('https://addons.mozilla.org/api/v3/addons/{}/'
+                      'versions/{}/').format(self.extensionID, self.version)
+
         with open(self.path, 'rb') as file:
             data, content_type = urllib3.filepost.encode_multipart_formdata({
                 'upload': (
                     os.path.basename(self.path),
                     file.read(),
                     'application/x-xpinstall'
                 )
             })
 
         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:
-            opener.open(request).close()
+            urllib2.urlopen(request).close()
         except urllib2.HTTPError as e:
-            logging.error(e.read())
+            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()