Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Techdebt: Replace string-format with f-strings (for l* dirs) (#5685)

Browse Source
This commit is contained in:
Bert Blommers 2022-11-19 22:28:54 -01:00 committed by GitHub
parent efeb110d06
commit 22b6205f1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/logs/exceptions.py
View File

@ -17,9 +17,7 @@ class InvalidParameterException(LogsClientError):
def __init__(self, msg=None, constraint=None, parameter=None, value=None): def __init__(self, msg=None, constraint=None, parameter=None, value=None):
self.code = 400 self.code = 400
if constraint: if constraint:
msg = "1 validation error detected: Value '{}' at '{}' failed to satisfy constraint: {}".format( msg = f"1 validation error detected: Value '{value}' at '{parameter}' failed to satisfy constraint: {constraint}"
value, parameter, constraint
)
super().__init__( super().__init__(
"InvalidParameterException", msg or "A parameter is specified incorrectly." "InvalidParameterException", msg or "A parameter is specified incorrectly."
) )

24
moto/logs/models.py
View File

@ -152,7 +152,7 @@ class LogStream(BaseModel):
formatted_log_events, formatted_log_events,
) )
return "{:056d}".format(self.upload_sequence_token) return f"{self.upload_sequence_token:056d}"
def get_log_events( def get_log_events(
self, self,
@ -211,26 +211,18 @@ class LogStream(BaseModel):
if start_index < 0: if start_index < 0:
start_index = 0 start_index = 0
elif start_index > final_index: elif start_index > final_index:
return ( return ([], f"b/{final_index:056d}", f"f/{final_index:056d}")
[],
"b/{:056d}".format(final_index),
"f/{:056d}".format(final_index),
)
if end_index > final_index: if end_index > final_index:
end_index = final_index end_index = final_index
elif end_index < 0: elif end_index < 0:
return ([], "b/{:056d}".format(0), "f/{:056d}".format(0)) return ([], f"b/{0:056d}", f"f/{0:056d}")
events_page = [ events_page = [
event.to_response_dict() for event in events[start_index : end_index + 1] event.to_response_dict() for event in events[start_index : end_index + 1]
] ]
return ( return (events_page, f"b/{start_index:056d}", f"f/{end_index:056d}")
events_page,
"b/{:056d}".format(start_index),
"f/{:056d}".format(end_index),
)
def filter_log_events(self, start_time, end_time, filter_pattern): def filter_log_events(self, start_time, end_time, filter_pattern):
def filter_func(event): def filter_func(event):
@ -358,9 +350,7 @@ class LogGroup(CloudFormationModel):
log_streams_page = [x[1] for x in log_streams[first_index:last_index]] log_streams_page = [x[1] for x in log_streams[first_index:last_index]]
new_token = None new_token = None
if log_streams_page and last_index < len(log_streams): if log_streams_page and last_index < len(log_streams):
new_token = "{}@{}".format( new_token = f"{log_group_name}@{log_streams_page[-1]['logStreamName']}"
log_group_name, log_streams_page[-1]["logStreamName"]
)
return log_streams_page, new_token return log_streams_page, new_token
@ -442,9 +432,7 @@ class LogGroup(CloudFormationModel):
next_token = None next_token = None
if events_page and last_index < len(events): if events_page and last_index < len(events):
last_event = events_page[-1] last_event = events_page[-1]
next_token = "{}@{}@{}".format( next_token = f"{log_group_name}@{last_event['logStreamName']}@{last_event['eventId']}"
log_group_name, last_event["logStreamName"], last_event["eventId"]
)
searched_streams = [ searched_streams = [
{"logStreamName": stream.log_stream_name, "searchedCompletely": True} {"logStreamName": stream.log_stream_name, "searchedCompletely": True}

2
moto/logs/responses.py
View File

@ -383,7 +383,7 @@ class LogsResponse(BaseResponse):
log_group_names, start_time, end_time, query_string log_group_names, start_time, end_time, query_string
) )
return json.dumps({"queryId": "{0}".format(query_id)}) return json.dumps({"queryId": f"{query_id}"})
def create_export_task(self): def create_export_task(self):
log_group_name = self._get_param("logGroupName") log_group_name = self._get_param("logGroupName")