summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--service/pixelated/adapter/model/mail.py6
-rw-r--r--service/pixelated/config/register.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/service/pixelated/adapter/model/mail.py b/service/pixelated/adapter/model/mail.py
index 841be05a..99ff0297 100644
--- a/service/pixelated/adapter/model/mail.py
+++ b/service/pixelated/adapter/model/mail.py
@@ -304,7 +304,7 @@ class PixelatedMail(Mail):
try:
_headers['Date'] = self._get_date()
- except Exception, e:
+ except Exception:
_headers['Date'] = pixelated.support.date.iso_now()
if self.parts and len(self.parts['alternatives']) > 1:
@@ -320,7 +320,7 @@ class PixelatedMail(Mail):
def _decode_header_with_fallback(self, entry):
try:
return decode_header(entry)[0][0]
- except Exception, e:
+ except Exception:
return entry.encode('ascii', 'ignore')
def _decode_header(self, header):
@@ -343,7 +343,7 @@ class PixelatedMail(Mail):
logger.warning('Encountered a mail with missing date and received header fields. ID %s' % self.fdoc.content.get('uid', None))
date = pixelated.support.date.iso_now()
return dateparser.parse(date).isoformat()
- except (ValueError, TypeError) as e:
+ except (ValueError, TypeError):
date = pixelated.support.date.iso_now()
return dateparser.parse(date).isoformat()
diff --git a/service/pixelated/config/register.py b/service/pixelated/config/register.py
index 9a6a5746..2f657a5b 100644
--- a/service/pixelated/config/register.py
+++ b/service/pixelated/config/register.py
@@ -28,7 +28,7 @@ logger = logging.getLogger(__name__)
def register(server_name, username):
try:
validate_username(username)
- except ValueError, e:
+ except ValueError:
print('Only lowercase letters, digits, . - and _ allowed.')
config = LeapConfig()