Merge branch 'release/3.5.1'

SpamScope · Sep 4, 2018 · 6b37578 · 6b37578
2 parents a583aae + c4488bb
commit 6b37578
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/mailparser/const.py b/mailparser/const.py
@@ -29,7 +29,8 @@
     (
         r'from\s+(?P<from>(?:\b(?!by\b)\S+[ :]*)*)'
         r'(?:by\s+(?P<by>(?:\b(?!with\b)\S+[ :]*)*))?'
-        r'(?:with\s+(?P<with>[^;]+))?(?:\s*;\s*(?P<date>.*))?'
+        r'(?:with\s+(?P<with>[^<]+)'
+        r'(?:\sfor\s+<(?P<for>[^>]+)>))?(?:\s*;\s*(?P<date>.*))?'
     ),
     (
         r'from\s+(?P<from>.*)\s+envelope-sender\s+'
@@ -51,6 +52,11 @@
         r'for\s+<(?P<for>[^>]+)>;\s(?P<date>.*)\s+'
         r'envelope-from\s+<(?P<envelope_from>[^>]+)>'
     ),
+    (
+        r'from\s+(?P<from>(?:\b(?!by\b)\S+[ :]*)*)'
+        r'(?:by\s+(?P<by>(?:\b(?!with\b)\S+[ :]*)*))?'
+        r'(?:with\s+(?P<with>[^;]+))?(?:\s*;\s*(?P<date>.*))?'
+    ),
     (
         r'qmail\s+.*\s+from\s+(?P<from>(?:\b(?!by\b)\S+[ :]*)*)'
         r'(?:\s*;\s*(?P<date>.*))?'

diff --git a/mailparser/version.py b/mailparser/version.py
@@ -17,7 +17,7 @@
 limitations under the License.
 """
 
-__version__ = "3.5.0"  # pragma: no cover
+__version__ = "3.5.1"  # pragma: no cover
 
 if __name__ == "__main__":  # pragma: no cover
     print(__version__)