Issue 5642 - Fix Windows Store devbuild upload routine

sitescripts/extensions/bin/createNightlies.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-present 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 599 matching lines @@
 
         # Create submission
         # https://msdn.microsoft.com/en-us/windows/uwp/monetize/create-an-app-submission
         request = urllib2.Request(submissions_path, '', headers)
         request.get_method = lambda: 'POST'
         with contextlib.closing(opener.open(request)) as response:
             submission = json.load(response)
 
         submission_id = submission['id']
         file_upload_url = submission['fileUploadUrl']
 

[Oleksandr, 2017/09/07 23:09:26]

NOTE: This code was part of the original review, but then it turned out
submission worked without this explicit update. It is not clear what really
happened, but now this is required again. See thread in original review:
https://codereview.adblockplus.org/29374637/diff/29375717/sitescripts/extensi...

         # Update submission
-        old_submission = submission['applicationPackages'][0]
-        old_submission['fileStatus'] = 'PendingDelete'
-        submission['applicationPackages'].append(
-        {'fileStatus': 'PendingUpload'})

[Sebastian Noack, 2017/09/08 00:15:55]

Please put closing parenthesis on a new line that starts in the same column as
the line with opening parenthesis, for better readability:

  submission['applicationPackages'].append(
      {'fileStatus': 'PendingUpload'}
  )

-        added_submission = submission['applicationPackages'][1]
-        added_submission['fileName'] = os.path.basename(self.path)
-        old_min_sys_ram = old_submission['minimumSystemRam']

[Sebastian Noack, 2017/09/08 00:15:55]

It seems to be possible to avoid the temporary variables, without exceeding 79
chars per line:

  added_submission.update(
      minimumSystemRam=old_submission['minimumSystemRam'],
      minimumDirectXVersion=old_submission['minimumDirectXVersion']
  )

I assume you made sure this is necessary in the first place, and just setting
fileStatus for the old and new submission isn't sufficient? (It seems a little
weird to me.)

[shoniko, 2017/09/08 11:12:33]

I was pretty sure I have tested minimal set of changes required, but now that I
retest only filename and status are required. So I am removing the redundant
code and simplifying formatting even further.

-        added_submission['minimumSystemRam'] = old_min_sys_ram
-        old_directx_version = old_submission['minimumDirectXVersion']
-        added_submission['minimumDirectXVersion'] = old_directx_version
+        submission['applicationPackages'][0]['fileStatus'] = 'PendingDelete'
+        submission['applicationPackages'].append({
+            'fileStatus': 'PendingUpload',
+            'fileName': os.path.basename(self.path),
+        })
 
         new_submission_path = '{}/{}'.format(submissions_path,
                                              submission_id)
         new_submission = json.dumps(submission)
 
         request = urllib2.Request(new_submission_path, new_submission, headers)
         request.get_method = lambda: 'PUT'
         opener.open(request).close()
 
         self.upload_appx_file_to_windows_store(file_upload_url)
@@ skipping 96 matching lines @@
         except Exception as ex:
             logging.error('The build for %s failed:', repo)
             logging.exception(ex)
 
     file = open(nightlyConfigFile, 'wb')
     nightlyConfig.write(file)
 
 
 if __name__ == '__main__':
     main()