diff options
Diffstat (limited to 'python/servo')
-rw-r--r-- | python/servo/bootstrap_commands.py | 4 | ||||
-rw-r--r-- | python/servo/build_commands.py | 11 | ||||
-rw-r--r-- | python/servo/command_base.py | 2 | ||||
-rw-r--r-- | python/servo/devenv_commands.py | 10 | ||||
-rw-r--r-- | python/servo/post_build_commands.py | 12 | ||||
-rw-r--r-- | python/servo/testing_commands.py | 7 |
6 files changed, 22 insertions, 24 deletions
diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index ad211b97eff..5cf2f39c927 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -40,7 +40,8 @@ def download(desc, src, dst): with open(dst, 'wb') as fd: while True: chunk = resp.read(chunk_size) - if not chunk: break + if not chunk: + break recved += len(chunk) if not dumb: pct = recved * 100.0 / fsize @@ -61,6 +62,7 @@ def download(desc, src, dst): sys.exit(1) + def extract(src, dst, movedir=None): tarfile.open(src).extractall(dst) diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index a0ff559ee54..6167431ac61 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -58,13 +58,14 @@ def notify_win(title, text): FLASHW_TIMERNOFG = 0x0C params = FLASHWINDOW(sizeof(FLASHWINDOW), - windll.kernel32.GetConsoleWindow(), - FLASHW_CAPTION | FLASHW_TRAY | FLASHW_TIMERNOFG, 3, 0) + windll.kernel32.GetConsoleWindow(), + FLASHW_CAPTION | FLASHW_TRAY | FLASHW_TIMERNOFG, 3, 0) FlashWindowEx(params) def notify_darwin(title, text): - import Foundation, objc + import Foundation + import objc NSUserNotification = objc.lookUpClass("NSUserNotification") NSUserNotificationCenter = objc.lookUpClass("NSUserNotificationCenter") @@ -291,7 +292,7 @@ class MachCommands(CommandBase): opts += ["--release"] opts += ["--target", "arm-linux-androideabi"] - env=self.build_env(gonk=True) + env = self.build_env(gonk=True) build_start = time() with cd(path.join("ports", "gonk")): ret = subprocess.call(["cargo", "build"] + opts, env=env) @@ -304,7 +305,6 @@ class MachCommands(CommandBase): return ret - @Command('build-tests', description='Build the Servo test suites', category='build') @@ -329,7 +329,6 @@ class MachCommands(CommandBase): @CommandArgument('--verbose', '-v', action='store_true', help='Print verbose output') - @CommandArgument('params', nargs='...', help="Command-line arguments to be passed through to Cargo") def clean(self, manifest_path, params, verbose=False): diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 5ac41b06009..5369b3e47f9 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -165,7 +165,7 @@ class CommandBase(object): print("The %s profile is not built. Please run './mach build%s' " "and try again." % ("release" if release else "dev", - " --release" if release else "")) + " --release" if release else "")) sys.exit() def build_env(self, gonk=False, hosts_file_path=None): diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py index e569951342e..7972b3b3978 100644 --- a/python/servo/devenv_commands.py +++ b/python/servo/devenv_commands.py @@ -36,8 +36,8 @@ class MachCommands(CommandBase): if self.context.topdir == getcwd(): with cd(path.join('components', 'servo')): - return subprocess.call(["cargo"] + params, - env=self.build_env()) + return subprocess.call( + ["cargo"] + params, env=self.build_env()) return subprocess.call(['cargo'] + params, env=self.build_env()) @@ -51,7 +51,7 @@ class MachCommands(CommandBase): '--package', '-p', default=None, help='Updates selected package') @CommandArgument( - '--all-packages','-a',action='store_true', + '--all-packages', '-a', action='store_true', help='Updates all packages') def cargo_update(self, params=None, package=None, all_packages=None): self.update_cargo(params, package, all_packages) @@ -63,10 +63,10 @@ class MachCommands(CommandBase): 'params', default=None, nargs='...', help='Command-line arguments to be passed through to cargo update') @CommandArgument( - '--package','-p',default=None, + '--package', '-p', default=None, help='Updates selected package') @CommandArgument( - '--all-packages','-a',action='store_true', + '--all-packages', '-a', action='store_true', help='Updates all packages') def update_cargo(self, params=None, package=None, all_packages=None): if not params: diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py index 9ed97bec045..1d37cc3211a 100644 --- a/python/servo/post_build_commands.py +++ b/python/servo/post_build_commands.py @@ -12,7 +12,6 @@ from __future__ import print_function, unicode_literals import os import os.path as path import subprocess -import sys from shutil import copytree, rmtree, copy2 from mach.registrar import Registrar @@ -49,7 +48,7 @@ class MachCommands(CommandBase): 'debugger being used. The following arguments ' 'have no effect without this.') @CommandArgument('--debugger', default=None, type=str, - help='Name of debugger to use.') + help='Name of debugger to use.') @CommandArgument( 'params', nargs='...', help="Command-line arguments to be passed through to Servo") @@ -74,8 +73,8 @@ class MachCommands(CommandBase): return 1 # Prepend the debugger args. - args = ([self.debuggerInfo.path] + self.debuggerInfo.args - + args + params) + args = ([self.debuggerInfo.path] + self.debuggerInfo.args + + args + params) else: args = args + params @@ -84,7 +83,7 @@ class MachCommands(CommandBase): except OSError as e: if e.errno == 2: print("Servo Binary can't be found! Run './mach build'" - " and try again!") + " and try again!") else: raise e @@ -132,8 +131,7 @@ class MachCommands(CommandBase): help="Command-line arguments to be passed through to cargo doc") def doc(self, params): self.ensure_bootstrapped() - if not path.exists(path.join( - self.config["tools"]["rust-root"], "doc")): + if not path.exists(path.join(self.config["tools"]["rust-root"], "doc")): Registrar.dispatch("bootstrap-rust-docs", context=self.context) rust_docs = path.join(self.config["tools"]["rust-root"], "doc") docs = path.join( diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index 2274c84c8ed..5d656b2bc97 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -281,7 +281,6 @@ class MachCommands(CommandBase): execfile(run_file, run_globals) return run_globals["update_tests"](**kwargs) - def ensure_wpt_virtualenv(self): virtualenv_path = path.join("tests", "wpt", "_virtualenv") python = self.get_exec("python2", "python") @@ -295,8 +294,8 @@ class MachCommands(CommandBase): execfile(activate_path, dict(__file__=activate_path)) try: - import wptrunner - from wptrunner.browsers import servo + import wptrunner # noqa + from wptrunner.browsers import servo # noqa except ImportError: subprocess.check_call(["pip", "install", "-r", path.join("tests", "wpt", "harness", "requirements.txt")]) @@ -311,7 +310,7 @@ class MachCommands(CommandBase): # before the virtualenv is initalised it doesn't see the blessings module so we don't # get coloured output. Setting the blessings global explicitly fixes that. from mozlog.structured.formatters import machformatter - import blessings + import blessings # noqa machformatter.blessings = blessings def get_exec(self, name, default=None): |