Skip to content

Commit

Permalink
pythongh-104683: Argument clinic: Minor readability improvements for …
Browse files Browse the repository at this point in the history
…`Destination.__init__` (python#106652)
  • Loading branch information
AlexWaygood authored Jul 11, 2023
1 parent de82732 commit 7ce3ea4
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions Tools/clinic/clinic.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down

0 comments on commit 7ce3ea4

Please sign in to comment.