Issue 356 - Fixed URL for publishing an item on the Chrome Web Store

sitescripts/extensions/bin/createNightlies.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2014 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,
@@ skipping 358 matching lines @@
     subprocess.check_call(command)
 
     try:
       import buildtools.build as build
       outputPath = os.path.join(self.config.docsDirectory, self.basename)
       build.generateDocs(self.tempdir, None, [("-t", docsdir), ("-q", "")], [outputPath], self.config.type)
     finally:
       shutil.rmtree(docsdir, ignore_errors=True)
 
   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)
+
+    opener = urllib2.build_opener(HTTPErrorHandler)
+
     # use refresh token to obtain a valid access token
     # https://developers.google.com/accounts/docs/OAuth2WebServer#refresh
 
-    response = json.load(urllib2.urlopen(
+    response = json.load(opener.open(
       'https://accounts.google.com/o/oauth2/token',
 
       urlencode([
         ('refresh_token', self.config.refreshToken),
         ('client_id', self.config.clientID),
         ('client_secret', self.config.clientSecret),
         ('grant_type', 'refresh_token'),
       ])
     ))
 
@@ skipping 10 matching lines @@
     with open(self.path, 'rb') as file:
       if file.read(8) != 'Cr24\x02\x00\x00\x00':
         raise Exception('not a chrome extension or unknown CRX version')
 
       # skip public key and signature
       file.seek(sum(struct.unpack('<II', file.read(8))), os.SEEK_CUR)
 
       request.add_header('Content-Length', os.fstat(file.fileno()).st_size - file.tell())
       request.add_data(file)
 
-      response = json.load(urllib2.urlopen(request))
+      response = json.load(opener.open(request))
 
     if response['uploadState'] == 'FAILURE':
       raise Exception(response['itemError'])
 
     # publish the new version on the Chrome Web Store
     # https://developer.chrome.com/webstore/using_webstore_api#publishpublic
 
-    request = urllib2.Request('https://www.googleapis.com/upload/chromewebstore/v1.1/items/%s/publish' % self.config.devbuildGalleryID)
+    request = urllib2.Request('https://www.googleapis.com/chromewebstore/v1.1/items/%s/publish' % self.config.devbuildGalleryID)
     request.get_method = lambda: 'POST'
     request.add_header('Authorization', auth_token)
     request.add_header('x-goog-api-version', '2')
     request.add_header('Content-Length', '0')
 
-    response = json.load(urllib2.urlopen(request))
+    response = json.load(opener.open(request))
 
     if any(status != 'ITEM_PENDING_REVIEW' for status in response['status']):
-      raise Exception(response['statusDetail'])
+      raise Exception({'status': response['status'], 'statusDetail': response['statusDetail']})
 
   def run(self):
     """
       Run the nightly build process for one extension
     """
     try:
       if self.config.type == 'ie':
         # We cannot build IE builds, simply list the builds already in
         # the directory. Basename has to be deduced from the repository name.
         self.basename = os.path.basename(self.config.repository)
@@ skipping 66 matching lines @@
     except Exception, ex:
       print >>sys.stderr, "The build for %s failed:" % repo
       traceback.print_exc()
 
   file = open(nightlyConfigFile, 'wb')
   nightlyConfig.write(file)
 
 
 if __name__ == '__main__':
   main()