From 810ebed3e2da5970bf9d432085a24ea3c826e781 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 1 Feb 2026 12:15:59 +0000 Subject: [PATCH] Fix code review issues: remove duplicate import and improve SMTP cleanup Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com> --- pop3_forwarder.py | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pop3_forwarder.py b/pop3_forwarder.py index d790e43..1417b77 100644 --- a/pop3_forwarder.py +++ b/pop3_forwarder.py @@ -202,18 +202,25 @@ class EmailForwarder: # Send via SMTP self.throttle.wait_if_needed() - if self.smtp_use_tls: - server = smtplib.SMTP(self.smtp_host, self.smtp_port) - server.starttls() - else: - server = smtplib.SMTP_SSL(self.smtp_host, self.smtp_port) - - server.login(self.smtp_user, self.smtp_password) - server.send_message(forward_msg) - server.quit() - - logger.info(f"Successfully forwarded email to {self.gmail_destination}") - return True + server = None + try: + if self.smtp_use_tls: + server = smtplib.SMTP(self.smtp_host, self.smtp_port) + server.starttls() + else: + server = smtplib.SMTP_SSL(self.smtp_host, self.smtp_port) + + server.login(self.smtp_user, self.smtp_password) + server.send_message(forward_msg) + + logger.info(f"Successfully forwarded email to {self.gmail_destination}") + return True + finally: + if server: + try: + server.quit() + except Exception: + pass # Ignore errors during cleanup except Exception as e: logger.error(f"Error forwarding email: {e}") @@ -228,7 +235,6 @@ class EmailForwarder: try: import http.client - import json conn = http.client.HTTPSConnection("api.postmarkapp.com")