diff options
author | Kagami Sascha Rosylight <saschanaz@outlook.com> | 2020-06-21 03:34:22 +0200 |
---|---|---|
committer | Kagami Sascha Rosylight <saschanaz@outlook.com> | 2020-06-21 03:34:32 +0200 |
commit | d01648d637a350af0cb81470f956cc5edd18a9a4 (patch) | |
tree | 348d75fe9d3e63fd4bb8ff2506db6606a12e56fd /python/servo/package_commands.py | |
parent | c953931621679f37fa31a1dc5f00ebb9f0c204e0 (diff) | |
download | servo-d01648d637a350af0cb81470f956cc5edd18a9a4.tar.gz servo-d01648d637a350af0cb81470f956cc5edd18a9a4.zip |
Fix remaining flake8 warnings
Diffstat (limited to 'python/servo/package_commands.py')
-rw-r--r-- | python/servo/package_commands.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index a9e77709cfb..e4fca52516f 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -30,9 +30,6 @@ from mach.decorators import ( Command, ) from mach.registrar import Registrar -# Note: mako cannot be imported at the top level because it breaks mach bootstrap -sys.path.append(path.join(path.dirname(__file__), "..", "..", - "components", "style", "properties", "Mako-1.1.2-py2.py3-none-any.whl")) from servo.command_base import ( archive_deterministically, @@ -44,6 +41,9 @@ from servo.command_base import ( ) from servo.util import delete +# Note: mako cannot be imported at the top level because it breaks mach bootstrap +sys.path.append(path.join(path.dirname(__file__), "..", "..", + "components", "style", "properties", "Mako-1.1.2-py2.py3-none-any.whl")) PACKAGES = { 'android': [ @@ -96,18 +96,18 @@ else: def get_taskcluster_secret(name): url = ( - os.environ.get("TASKCLUSTER_PROXY_URL", "http://taskcluster") + - "/api/secrets/v1/secret/project/servo/" + - name + os.environ.get("TASKCLUSTER_PROXY_URL", "http://taskcluster") + + "/api/secrets/v1/secret/project/servo/" + + name ) return json.load(urllib.request.urlopen(url))["secret"] def otool(s): o = subprocess.Popen(['/usr/bin/otool', '-L', s], stdout=subprocess.PIPE) - for l in o.stdout: - if l[0] == '\t': - yield l.split(' ', 1)[0][1:] + for line in o.stdout: + if line[0] == '\t': + yield line.split(' ', 1)[0][1:] def listfiles(directory): @@ -781,7 +781,7 @@ def setup_uwp_signing(ms_app_store, publisher): print("Packaging on TC. Using secret certificate") pfx = get_taskcluster_secret("windows-codesign-cert/latest")["pfx"] open("servo.pfx", "wb").write(base64.b64decode(pfx["base64"])) - run_powershell_cmd('Import-PfxCertificate -FilePath .\servo.pfx -CertStoreLocation Cert:\CurrentUser\My') + run_powershell_cmd('Import-PfxCertificate -FilePath .\\servo.pfx -CertStoreLocation Cert:\\CurrentUser\\My') os.remove("servo.pfx") # Powershell command that lists all certificates for publisher @@ -796,7 +796,7 @@ def setup_uwp_signing(ms_app_store, publisher): # PowerShell command that creates and install signing certificate for publisher cmd = '(New-SelfSignedCertificate -Type Custom -Subject ' + publisher + \ ' -FriendlyName "Allizom Signing Certificate (temporary)"' + \ - ' -KeyUsage DigitalSignature -CertStoreLocation "Cert:\CurrentUser\My"' + \ + ' -KeyUsage DigitalSignature -CertStoreLocation "Cert:\\CurrentUser\\My"' + \ ' -TextExtension @("2.5.29.37={text}1.3.6.1.5.5.7.3.3", "2.5.29.19={text}")).Thumbprint' thumbprint = run_powershell_cmd(cmd) elif len(certs) > 1: |