mail-parser 4.1.2__tar.gz → 4.1.4__tar.gz

{mail_parser-4.1.2/src/mail_parser.egg-info → mail_parser-4.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: mail-parser
-Version: 4.1.2
+Version: 4.1.4
 Summary: Improved wrapper for email standard library
 Home-page: https://github.com/SpamScope/mail-parser
 Author: Fedele Mantuano
@@ -15,15 +15,13 @@ Classifier: Operating System :: OS Independent
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 License-File: NOTICE.txt
-Requires-Dist: ipaddress
 Requires-Dist: six
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
@@ -36,6 +34,7 @@ Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
 Requires-Dist: pytest-mock; extra == "test"
 Requires-Dist: pytest-ordering; extra == "test"
+Dynamic: license-file
 
 [![PyPI - Version](https://img.shields.io/pypi/v/mail-parser)](https://pypi.org/project/mail-parser/)
 [![Coverage Status](https://coveralls.io/repos/github/SpamScope/mail-parser/badge.svg?branch=develop)](https://coveralls.io/github/SpamScope/mail-parser?branch=develop)

{mail_parser-4.1.2 → mail_parser-4.1.4}/setup.cfg

@@ -18,7 +18,6 @@ classifiers =
 	Natural Language :: English
 	Programming Language :: Python
 	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.7
 	Programming Language :: Python :: 3.8
 	Programming Language :: Python :: 3.9
 	Programming Language :: Python :: 3.10
@@ -28,9 +27,8 @@ package_dir =
 	=src
 packages = find:
 install_requires = 
-	ipaddress
 	six
-python_requires = >=3.7
+python_requires = >=3.8
 
 [options.packages.find]
 where = src

{mail_parser-4.1.2 → mail_parser-4.1.4/src/mail_parser.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: mail-parser
-Version: 4.1.2
+Version: 4.1.4
 Summary: Improved wrapper for email standard library
 Home-page: https://github.com/SpamScope/mail-parser
 Author: Fedele Mantuano
@@ -15,15 +15,13 @@ Classifier: Operating System :: OS Independent
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 License-File: NOTICE.txt
-Requires-Dist: ipaddress
 Requires-Dist: six
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
@@ -36,6 +34,7 @@ Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
 Requires-Dist: pytest-mock; extra == "test"
 Requires-Dist: pytest-ordering; extra == "test"
+Dynamic: license-file
 
 [![PyPI - Version](https://img.shields.io/pypi/v/mail-parser)](https://pypi.org/project/mail-parser/)
 [![Coverage Status](https://coveralls.io/repos/github/SpamScope/mail-parser/badge.svg?branch=develop)](https://coveralls.io/github/SpamScope/mail-parser?branch=develop)

{mail_parser-4.1.2 → mail_parser-4.1.4}/src/mail_parser.egg-info/requires.txt

@@ -1,4 +1,3 @@
-ipaddress
 six
 
 [dev]

{mail_parser-4.1.2 → mail_parser-4.1.4}/src/mailparser/__main__.py

@@ -202,7 +202,7 @@ def main():
         parser = get_parser(args)
         process_output(args, parser)
     except Exception as e:
-        log.error(f"An error occurred: {e}")
+        log.exception(f"An error occurred: {e}")
         sys.exit(1)
 
 

{mail_parser-4.1.2 → mail_parser-4.1.4}/src/mailparser/core.py

@@ -355,7 +355,7 @@ class MailParser(object):
                 charset = p.get_content_charset("utf-8")
                 charset_raw = p.get_content_charset()
                 log.debug("Charset {!r} part {!r}".format(charset, i))
-                content_disposition = ported_string(p.get("content-disposition"))
+                content_disposition = ported_string(p.get_content_disposition()).lower()
                 log.debug(
                     "content-disposition {!r} part {!r}".format(content_disposition, i)
                 )
@@ -638,14 +638,12 @@ class MailParser(object):
         )
 
     @property
-    def headers(self):
+    def headers(self) -> dict:
         """
         Return only the headers as Python object
         """
-        d = {}
-        for i in self.message.keys():
-            d[i] = getattr(self, i)
-        return d
+        all_headers = set(self.message.keys()) - set(["headers"])
+        return {i: getattr(self, i) for i in all_headers}
 
     @property
     def headers_json(self):

{mail_parser-4.1.2 → mail_parser-4.1.4}/src/mailparser/version.py

@@ -17,4 +17,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-__version__ = "4.1.2"
+__version__ = "4.1.4"

{mail_parser-4.1.2 → mail_parser-4.1.4}/tests/test_mail_parser.py

@@ -62,6 +62,7 @@ mail_test_12 = os.path.join(base_path, "mails", "mail_test_12")
 mail_test_13 = os.path.join(base_path, "mails", "mail_test_13")
 mail_test_14 = os.path.join(base_path, "mails", "mail_test_14")
 mail_test_15 = os.path.join(base_path, "mails", "mail_test_15")
+mail_test_16 = os.path.join(base_path, "mails", "mail_test_16")
 mail_malformed_1 = os.path.join(base_path, "mails", "mail_malformed_1")
 mail_malformed_2 = os.path.join(base_path, "mails", "mail_malformed_2")
 mail_malformed_3 = os.path.join(base_path, "mails", "mail_malformed_3")
@@ -646,3 +647,17 @@ class TestMailParser(unittest.TestCase):
             md5.update(f.read())
         shutil.rmtree(temp_dir)
         self.assertEqual(md5.hexdigest(), "4f2cf891e7cfb349fca812091f184ecc")
+
+    def test_issue_139(self):
+        mail = mailparser.parse_from_file(mail_test_16)
+        assert mail.headers == {
+            "MIME-Version": "1.0",
+            "Precedence": "junk",
+            "Content-Type": "text/plain; charset=us-ascii",
+            "From": [("Sender", "sender@example.net")],
+            "Date": "Wed, 23 Jul 2003 23:30:00 +0200",
+            "Content-Transfer-Encoding": "7bit",
+            "Message-ID": "<GTUBE1.1010101@example.net>",
+            "Subject": "Test spam mail (GTUBE)",
+            "To": [("Recipient", "recipient@example.net")],
+        }