From 7ce3ea4906986c2bab784c878d31c57b14ee1945 Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Wed, 12 Jul 2023 00:08:28 +0100 Subject: [PATCH] gh-104683: Argument clinic: Minor readability improvements for `Destination.__init__` (#106652) --- Tools/clinic/clinic.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py index 12ab633388485e..a0cf50b29c978d 100755 --- a/Tools/clinic/clinic.py +++ b/Tools/clinic/clinic.py @@ -1959,14 +1959,19 @@ def __init__(self, name, type, clinic, *args): self.name = name self.type = type self.clinic = clinic + self.buffers = BufferSeries() + valid_types = ('buffer', 'file', 'suppress') if type not in valid_types: - fail("Invalid destination type " + repr(type) + " for " + name + " , must be " + ', '.join(valid_types)) + fail( + f"Invalid destination type {type!r} for {name}, " + f"must be {', '.join(valid_types)}" + ) extra_arguments = 1 if type == "file" else 0 if len(args) < extra_arguments: - fail("Not enough arguments for destination " + name + " new " + type) + fail(f"Not enough arguments for destination {name} new {type}") if len(args) > extra_arguments: - fail("Too many arguments for destination " + name + " new " + type) + fail(f"Too many arguments for destination {name} new {type}") if type =='file': d = {} filename = clinic.filename @@ -1979,8 +1984,6 @@ def __init__(self, name, type, clinic, *args): d['basename_root'], d['basename_extension'] = os.path.splitext(filename) self.filename = args[0].format_map(d) - self.buffers = BufferSeries() - def __repr__(self): if self.type == 'file': file_repr = " " + repr(self.filename)