Skip to content

Commit

Permalink
Upgrade python syntax to 3.8+
Browse files Browse the repository at this point in the history
Using pyupgrade.
  • Loading branch information
sebix committed Dec 1, 2024
1 parent 853b66f commit 15d0439
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/python/github.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,20 @@ def __init__(self):

def get_reviews(self):
""" Get a list of reviews on a Github pull request as json object """
reviews = self.session.get(self.api + 'repos/{}/pulls/{}/reviews'.format(self.github_repository, self.pr_id))
reviews = self.session.get(self.api + f'repos/{self.github_repository}/pulls/{self.pr_id}/reviews')
reviews.raise_for_status()
return reviews.json()

def update_review(self, review_id, body):
""" Update a review given by `review_id` and set its body to `body` """
payload = {'body': body}
resp = self.session.put(self.api + 'repos/{}/pulls/{}/reviews/{}'.format(self.github_repository, self.pr_id, review_id), json=payload)
resp = self.session.put(self.api + f'repos/{self.github_repository}/pulls/{self.pr_id}/reviews/{review_id}', json=payload)
resp.raise_for_status()
return resp.json()

def post_review(self, body):
""" Post a pull request review containing `body` and requesting changes """
payload = {'body': body, 'event': "REQUEST_CHANGES"}
resp = self.session.post(self.api + 'repos/{}/pulls/{}/reviews'.format(self.github_repository, self.pr_id), json=payload)
resp = self.session.post(self.api + f'repos/{self.github_repository}/pulls/{self.pr_id}/reviews', json=payload)
resp.raise_for_status()
return resp.json()
4 changes: 2 additions & 2 deletions .github/workflows/python/pycodestyle_comment.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def style_error_format(style_error_list) -> str:
""" Format the list of pycodestyle errors and return them a one string. """
ret = ''
for error in style_error_list:
ret += '* {}\n'.format(error)
ret += f'* {error}\n'
return ret


Expand All @@ -45,7 +45,7 @@ def style_error_format(style_error_list) -> str:
style_errors = list_style_errors()

if style_errors:
print("Found {} errors.".format(len(style_errors)))
print(f"Found {len(style_errors)} errors.")

gh = github.Github()

Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Please refer to the change log for a full list of changes.
---------------------------------

### Requirements
Python 3.8 or newer is required
Python 3.8 or newer is required.

### Tools

Expand Down
2 changes: 1 addition & 1 deletion contrib/example-extension-package/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
entry_point = '.'.join(file.with_suffix('').parts)
file = Path(str(file).replace('intelmq/bots', 'mybots/bots'))
module = '.'.join(file.with_suffix('').parts)
BOTS.append('{0} = {1}:BOT.run'.format(entry_point, module))
BOTS.append(f'{entry_point} = {module}:BOT.run')

setup(
name='intelmq-example-extension',
Expand Down
2 changes: 1 addition & 1 deletion intelmq/bots/collectors/rsync/collector_rsync.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from intelmq.lib.bot import CollectorBot


class Time(object):
class Time:
def __init__(self, delta=None):
""" Delta is a datetime.timedelta JSON string, ex: '{days=-1}'. """
self.time = datetime.now()
Expand Down
5 changes: 1 addition & 4 deletions intelmq/bots/experts/modify/expert.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ def is_re_pattern(value):
"""
Checks if the given value is a re compiled pattern
"""
if sys.version_info > (3, 7):
return isinstance(value, re.Pattern)
else:
return hasattr(value, "pattern")
return isinstance(value, re.Pattern)


class MatchGroupMapping:
Expand Down
2 changes: 1 addition & 1 deletion intelmq/bots/outputs/smtp_batch/output.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def cli_run(self):
with open(self.mail_template) as f:
self.mail_contents = f.read()
if self.alternative_mails:
with open(self.alternative_mails, "r") as f:
with open(self.alternative_mails) as f:
self.alternative_mail = {row[0]: row[1] for row in csv.reader(f, delimiter=",")}

print("Preparing mail queue...")
Expand Down

0 comments on commit 15d0439

Please sign in to comment.