From bfe2d1f3baf4d0d129f7093aa7789d0d4d8f86c3 Mon Sep 17 00:00:00 2001 From: Andrew Bogott Date: Tue, 5 Mar 2019 16:36:11 +0000 Subject: [PATCH] flake8 fixes: correct some indentations --- bootstrapvz/base/tasklist.py | 2 +- bootstrapvz/common/tasks/apt.py | 2 +- bootstrapvz/plugins/prebootstrapped/tasks.py | 30 ++++----- bootstrapvz/providers/ec2/__init__.py | 10 +-- tests/system/providers/ec2/__init__.py | 2 +- tests/system/tools/__init__.py | 66 ++++++++++---------- 6 files changed, 56 insertions(+), 56 deletions(-) diff --git a/bootstrapvz/base/tasklist.py b/bootstrapvz/base/tasklist.py index ed1c74e..5aa9e35 100644 --- a/bootstrapvz/base/tasklist.py +++ b/bootstrapvz/base/tasklist.py @@ -189,7 +189,7 @@ def get_all_classes(path=None, prefix='', excludes=[]): for class_name, obj in classes: # We only want classes that are defined in the module, and not imported ones if obj.__module__ == module_name: - yield obj + yield obj def check_ordering(task): diff --git a/bootstrapvz/common/tasks/apt.py b/bootstrapvz/common/tasks/apt.py index bde3a04..07b8bd3 100644 --- a/bootstrapvz/common/tasks/apt.py +++ b/bootstrapvz/common/tasks/apt.py @@ -100,7 +100,7 @@ class AddManifestPreferences(Task): @classmethod def run(cls, info): for name, preferences in info.manifest.packages['preferences'].iteritems(): - info.preference_lists.add(name, preferences) + info.preference_lists.add(name, preferences) class InstallTrustedKeys(Task): diff --git a/bootstrapvz/plugins/prebootstrapped/tasks.py b/bootstrapvz/plugins/prebootstrapped/tasks.py index 85240ff..4a23aa6 100644 --- a/bootstrapvz/plugins/prebootstrapped/tasks.py +++ b/bootstrapvz/plugins/prebootstrapped/tasks.py @@ -104,20 +104,20 @@ class CreateFromFolder(Task): def set_fs_states(vol): - vol.fsm.current = 'detached' + vol.fsm.current = 'detached' - p_map = vol.partition_map - from bootstrapvz.base.fs.partitionmaps.none import NoPartitions - if not isinstance(p_map, NoPartitions): - p_map.fsm.current = 'unmapped' + p_map = vol.partition_map + from bootstrapvz.base.fs.partitionmaps.none import NoPartitions + if not isinstance(p_map, NoPartitions): + p_map.fsm.current = 'unmapped' - from bootstrapvz.base.fs.partitions.unformatted import UnformattedPartition - from bootstrapvz.base.fs.partitions.single import SinglePartition - for partition in p_map.partitions: - if isinstance(partition, UnformattedPartition): - partition.fsm.current = 'unmapped' - continue - if isinstance(partition, SinglePartition): - partition.fsm.current = 'formatted' - continue - partition.fsm.current = 'unmapped_fmt' + from bootstrapvz.base.fs.partitions.unformatted import UnformattedPartition + from bootstrapvz.base.fs.partitions.single import SinglePartition + for partition in p_map.partitions: + if isinstance(partition, UnformattedPartition): + partition.fsm.current = 'unmapped' + continue + if isinstance(partition, SinglePartition): + partition.fsm.current = 'formatted' + continue + partition.fsm.current = 'unmapped_fmt' diff --git a/bootstrapvz/providers/ec2/__init__.py b/bootstrapvz/providers/ec2/__init__.py index 1684142..d219105 100644 --- a/bootstrapvz/providers/ec2/__init__.py +++ b/bootstrapvz/providers/ec2/__init__.py @@ -35,19 +35,19 @@ def validate_manifest(data, validator, error): error('Paravirtualized AMIs only support pvgrub as a bootloader', ['system', 'bootloader']) if backing != 'ebs' and virtualization == 'hvm': - error('HVM AMIs currently only work when they are EBS backed', ['volume', 'backing']) + error('HVM AMIs currently only work when they are EBS backed', ['volume', 'backing']) if backing == 's3' and partition_type != 'none': - error('S3 backed AMIs currently only work with unpartitioned volumes', ['system', 'bootloader']) + error('S3 backed AMIs currently only work with unpartitioned volumes', ['system', 'bootloader']) if backing != 'ebs' and encrypted: - error('Encryption is supported only on EBS volumes') + error('Encryption is supported only on EBS volumes') if encrypted is False and kms_key_id is not None: - error('KMS Key Id can be set only when encryption is enabled') + error('KMS Key Id can be set only when encryption is enabled') if enhanced_networking == 'simple' and virtualization != 'hvm': - error('Enhanced networking only works with HVM virtualization', ['provider', 'virtualization']) + error('Enhanced networking only works with HVM virtualization', ['provider', 'virtualization']) def resolve_tasks(taskset, manifest): diff --git a/tests/system/providers/ec2/__init__.py b/tests/system/providers/ec2/__init__.py index 795760b..f7d043c 100644 --- a/tests/system/providers/ec2/__init__.py +++ b/tests/system/providers/ec2/__init__.py @@ -23,7 +23,7 @@ def prepare_bootstrap(manifest, build_server): bucket.delete_key(item.key) s3_connection.delete_bucket(manifest.image['bucket']) else: - yield + yield @contextmanager diff --git a/tests/system/tools/__init__.py b/tests/system/tools/__init__.py index 6db90ce..07b7d0b 100644 --- a/tests/system/tools/__init__.py +++ b/tests/system/tools/__init__.py @@ -46,42 +46,42 @@ def waituntil(predicate, timeout=5, interval=0.05): def read_from_socket(socket_path, termination_string, timeout, read_timeout=0.5): - import socket - import select - import errno - console = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - console.connect(socket_path) - console.setblocking(0) + import socket + import select + import errno + console = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + console.connect(socket_path) + console.setblocking(0) - from timeit import default_timer - start = default_timer() + from timeit import default_timer + start = default_timer() - output = '' - ptr = 0 - continue_select = True - while continue_select: - read_ready, _, _ = select.select([console], [], [], read_timeout) - if console in read_ready: - while True: - try: - output += console.recv(1024) - if termination_string in output[ptr:]: - continue_select = False - else: - ptr = len(output) - len(termination_string) - break - except socket.error, e: - if e.errno != errno.EWOULDBLOCK: - raise Exception(e) + output = '' + ptr = 0 + continue_select = True + while continue_select: + read_ready, _, _ = select.select([console], [], [], read_timeout) + if console in read_ready: + while True: + try: + output += console.recv(1024) + if termination_string in output[ptr:]: continue_select = False - if default_timer() - start > timeout: - from .exceptions import SocketReadTimeout - msg = ('Reading from socket `{path}\' timed out after {seconds} seconds.\n' - 'Here is the output so far:\n{output}' - .format(path=socket_path, seconds=timeout, output=output)) - raise SocketReadTimeout(msg) - console.close() - return output + else: + ptr = len(output) - len(termination_string) + break + except socket.error, e: + if e.errno != errno.EWOULDBLOCK: + raise Exception(e) + continue_select = False + if default_timer() - start > timeout: + from .exceptions import SocketReadTimeout + msg = ('Reading from socket `{path}\' timed out after {seconds} seconds.\n' + 'Here is the output so far:\n{output}' + .format(path=socket_path, seconds=timeout, output=output)) + raise SocketReadTimeout(msg) + console.close() + return output @contextmanager