Updated actions

.github/workflows/main.yml

@@ -32,6 +32,7 @@ jobs:
           sudo cpan -f -i Email::Outlook::Message
 
       - name: Run pre-commit
+        if: matrix.python-version == '3.10'
         run: |
           make pre-commit
 
@@ -44,11 +45,13 @@ jobs:
           cat tests/mails/mail_malformed_3 | mail-parser -k -j
 
       - name: Report to Coveralls
+        if: matrix.python-version == '3.10'
         uses: coverallsapp/[email protected]
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build
+        if: matrix.python-version == '3.10'
         run: |
           python -m build
 

src/mailparser/__main__.py

@@ -184,10 +184,8 @@ def get_args():
         help="Path where store attachments")
 
     parser.add_argument(
-        '-v',
-        '--version',
-        action='version',
-        version='%(prog)s {}'.format(__version__))
+        '-v', '--version', action='version', version=f'%(prog)s {__version__}'
+    )
 
     return parser
 

src/mailparser/mailparser.py

@@ -133,15 +133,11 @@ def __init__(self, message=None):
         Init a new object from a message object structure.
         """
         self._message = message
-        log.debug(
-            "All headers of emails: {}".format(", ".join(message.keys())))
+        log.debug(f'All headers of emails: {", ".join(message.keys())}')
         self.parse()
 
     def __str__(self):
-        if self.message:
-            return self.subject
-        else:
-            return six.text_type()
+        return self.subject if self.message else six.text_type()
 
     @classmethod
     def from_file_obj(cls, fp):
@@ -159,7 +155,7 @@ def from_file_obj(cls, fp):
         try:
             fp.seek(0)
         except IOError:
-            # When stdout is a TTY it's a character device
+            # When stdout is a TTY it's a character device,
             # and it's not seekable, you cannot seek in a TTY.
             pass
         finally:
@@ -299,8 +295,7 @@ def _make_mail(self, complete=True):
 
         for i in keys:
             log.debug("Getting header or part {!r}".format(i))
-            value = getattr(self, i)
-            if value:
+            if value := getattr(self, i):
                 mail[i] = value
 
         # add defects