Skip to content

Commit

Permalink
Merge branch 'hotfix/3.2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@fedelemantuano
fedelemantuano committed Jan 13, 2018
2 parents 7650e8d + f093833 commit b7d52bc
Show file tree
Hide file tree
Showing 5 changed files with 175 additions and 4 deletions.
4 changes: 1 addition & 3 deletions mailparser/mailparser.py
View file
Expand Up @@ -448,9 +448,7 @@ def received(self):
"""
Return a list of all received headers parsed
"""
output = []
for i in self.message.get_all("received", []):
output.append(decode_header_part(i))
output = self.received_raw
return receiveds_parsing(output)

@property
Expand Down
3 changes: 3 additions & 0 deletions mailparser/utils.py
View file
Expand Up @@ -261,6 +261,9 @@ def receiveds_format(receiveds):

# Add UTC date
if i.get("date"):
# Modify date to manage strange header like:
# "for <eboktor@romolo.com>; Tue, 7 Mar 2017 14:29:24 -0800",
i["date"] = i["date"].split(";")[-1]
j["date_utc"] = convert_mail_date(i["date"])

# Add delay
Expand Down
2 changes: 1 addition & 1 deletion mailparser/version.py
View file
Expand Up @@ -17,7 +17,7 @@
limitations under the License.
"""

__version__ = "3.2.1"
__version__ = "3.2.2"

if __name__ == "__main__":
print(__version__)
163 changes: 163 additions & 0 deletions tests/mails/mail_test_8
View file
@@ -0,0 +1,163 @@
Return-Path: <Helicopter_flight_simulator@moneytrack.top>
Delivered-To: eboktor@romolo.com
Received: (qmail 23530 invoked from network); 7 Mar 2017 22:29:25 -0000
Received: from host.colocrossing.com (HELO 04d930f1.moneytrack.top) (198.23.142.158)
by smtp.dakota.net with SMTP; 7 Mar 2017 22:29:25 -0000
Received: from 04d930f1.lyeo00hp.moneytrack.top ([127.0.0.1]:8615 helo=lyeo00hp.moneytrack.top)
by lyeo00hp.moneytrack.top with ESMTP id 04EKOWYD930WHFJSF1;
for <eboktor@romolo.com>; Tue, 7 Mar 2017 14:29:24 -0800
Message-ID: <3615343813390903615122237013831979@lyeo00hp.moneytrack.top>
To: <eboktor@romolo.com>
Date: Tue, 7 Mar 2017 14:29:24 -0800
From: "Helicopter_flight_simulator" <Helicopter_flight_simulator@moneytrack.top>
Subject: Have you ever wanted to land on an Aircraft Carrier
Content-Language: en-us
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: multipart/alternative;
boundary="----=Part.335.4745.1488925764"

------=Part.335.4745.1488925764
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="UTF-8"

"The Perfect Filler Between Real World Flying"
Imagine "Real Life" Flying At The Comfort Of Your Home...
Click here

http://www.moneytrack.top/l/lt10VX3615QP370UC/1222A1383JJ1979TG249B81339090GF3323432606

With 120+ Aircraft to Master, From the 1903 Wright Flyer to the Latest Military Fighter Jets.
20,000+ Real Airports With changeable Weather and NASA Flight Models.
Realistic Worldwide Terrain Based On US Defense Mapping Agency + Lifetime FREE updates/upgrades.
Used On Television Episodes & Professional Flight Schools - The Most Realistic Flight Sim To Date...

http://www.moneytrack.top/l/lt10YC3615UB370FH/1222R1383JC1979CT249C81339090FD3323432606

Meet up online with other ProFlightSimulator Users to fly in formation, put on an
air show or just to have fun. You can easily locate other pilots or yourself with
Google Map integration - Multiplayer map server shows all the active pilots
superimposed on top of a Google map.
Enjoy Real-Life Flying Today

http://www.moneytrack.top/l/lt10SG3615LD370EN/1222O1383GD1979LL249Y81339090AK3323432606








If you do not want to receive any further mail click here.
82023 Peters Road, Suite 1000 Plantation, FL 33324

http://www.moneytrack.top/l/lc13NE3615MS370NH/1222I1383VY1979GM249T81339090TL3323432606

------=Part.335.4745.1488925764
Content-Transfer-Encoding: 8bit
Content-Type: text/html; charset="UTF-8"

<!DOCTYPE html>
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body><br>
<table class="main" style="margin:0 auto; font-size:18px; font-family:'Arial', Gadget, sans-serif; width:60%;" border="0" cellspacing="0" cellpadding="10">
<tr>
<td style=" background-color:#7494CC;border-bottom:thick solid #C4E44A;"><div style="font-weight:normal;border-image-slice:100%;font-family:constania;font-style:normal;margin-left:40px;margin-right:0px;border-bottom-color:rgb(0,0,0);color:white;border-left-color:rgb(0,0,0);border-bottom-style:none;vertical-align:baseline;font-stretch:normal;border-left-width:0px;padding-right:0px;margin-top:0px;border-top-color:rgb(0,0,0);border-top-width:0px;border-image-outset:0px;padding-top:0px;border-image-width:1;padding-left:0px;font-size:28px;border-bottom-width:0px;float:left;outline-width:0px;border-image-source:none;border-image-repeat:stretch;font-variant:normal;outline-color:rgb(0,0,0);outline-style:none;border-left-style:none;line-height:36px;text-align:center;border-right-color:rgb(0,0,0);display:block;"><strong>"The Perfect Filler Between Real World Flying" </strong></div></td>
</tr>
<tr>
<td style="border-bottom:thick #C4E44A solid;">
<table align="center" style="font-size:23px;">
<tr >
<td >
<b><a href="http://www.moneytrack.top/l/lc1CD3615SO370MA/1222K1383FY1979KO249B81339090MO3323432606">Imagine "Real Life" Flying At The Comfort Of Your Home...</a></b> </td></tr>
</table>
<table border="0" cellspacing="0" cellpadding="10">

<tr>
<td>
<a href="http://www.moneytrack.top/l/lc1PH3615IG370UK/1222W1383YQ1979JE249U81339090OV3323432606">
<img src="http://www.moneytrack.top/im/VR3615Q370G/1222L1383RY1979TX249K81339090JX3323432606/img03701222343.gif" alt="Click here" /></a></td>

<td>
<table>
<tr valign="top">
<td height="10"><img src="http://www.moneytrack.top/im/GG3615S370E/1222K1383PN1979TW249T81339090DK3323432606/img13701222343.jpg" alt=" " /></td>
<td height="10" bgcolor="#D4DCEC" style="font-size:16px;font-family:Arial,sans-serif;height:auto; line-height:19px;padding:5px;" color="#333333"> With 120+ Aircraft to Master, From the 1903 Wright Flyer to the Latest Military Fighter Jets.</td>

</tr>
<tr valign="top">
<td height="10"><img src="http://www.moneytrack.top/im/BP3615F370D/1222W1383TJ1979CI249T81339090QY3323432606/img13701222343.jpg" alt=" " /></td>
<td height="10" bgcolor="#FDE351" style="font-size:16px;font-family:Arial,sans-serif;height:auto; line-height:19px;padding:5px; color="#333333"> 20,000+ Real Airports With changeable Weather and NASA Flight Models.</font></td>

</tr>
<tr valign="top">
<td height="10"><img src="http://www.moneytrack.top/im/MX3615M370K/1222A1383XP1979XW249V81339090WO3323432606/img13701222343.jpg" alt=" " /></td>
<td height="10" bgcolor="#D4DCEC" style="font-size:16px;font-family:Arial,sans-serif;height:auto; line-height:19px;padding:5px; color="#333333"> Realistic Worldwide Terrain Based On US Defense Mapping Agency + Lifetime FREE updates/upgrades.</font></td>

</tr>
<tr valign="top">
<td height="10"><img src="http://www.moneytrack.top/im/EC3615R370N/1222U1383TT1979NW249C81339090EH3323432606/img13701222343.jpg" alt=" " /></td>
<td height="10" bgcolor="#FDE351" style="font-size:16px;font-family:Arial,sans-serif;height:auto; line-height:19px;padding:5px; color:#333333"> Used On Television Episodes & Professional Flight Schools - The Most Realistic Flight Sim To Date...</font></td>

</tr>
</table>
</td>

</tr>
</table></td>

</tr></tr>
<tr class="abc">
<td bgcolor="#7494CC" style="text-align:center;font-size:17px;font-family:Arial,sans-serif;line-height:20px;">
Meet up online with other <b><a style="color:white"href="http://www.moneytrack.top/l/lc1VH3615US370HK/1222Q1383TF1979MX249S81339090CC3323432606">ProFlightSimulator Users</a></b> to fly in formation, put on an <br>
air show or just to have fun. You can easily locate other pilots or yourself with <br>Google Map integration - Multiplayer map server shows all the active pilots <br>superimposed on top of a <b>Google map</b>.</td>
</tr>
<tr>
<td align="center" style="padding:20px;"><table style="border-radius:18px; background: linear-gradient(to bottom,#fff,#E6EAEE); border:1px solid #cdcdcd; text-align:center;padding:10px;"><tr>
<td >
<a href="http://www.moneytrack.top/l/lc1UO3615GQ370LQ/1222T1383BC1979UO249B81339090SN3323432606" style="display:block; color:#5A1114; font-size:20px; text-decoration:none;"><strong>Enjoy Real-Life Flying Today </strong></a>

</td>

</tr>
</table></td>
</tr>
<tr>
<td><hr style="width:400px;background-color:#9AD4EC;"> </td>
</tr>
<tr>
<td> </td>
</tr>

</table>
<p> </p>
<p align="center"></p>

<br>

<div align="center" title="" id="9px" name="13px" style="font-size:13px;">

If you do not want to receive any further mail <a href="http://www.moneytrack.top/l/lc5WI3615DS370TC/1222E1383QE1979AF249P81339090EE3323432606" style=""> click here. </a><br>82023 Peters Road, Suite 1000 Plantation, FL 33324
</div>
<p> </p>
<p> </p>
<p> </p>
<div style="color:#FFFFFF; font-size:17px;"><!-- <div style="position:absolute;top:-1000px;left:-1000px;height:0px;width:0px;"><img src="http://www.moneytrack.top/timgWHAQHQMBA/LTGGLHYBR/3615/1383/1979/249/81339090/img.gif" style="border=0;" /></div> -->
<div style="position:absolute;top:-1000px;left:-1000px;height:0px;width:0px;"><a href="http://www.moneytrack.top/trPLXIXBJNX/JOGSMHARC/3615/1383/1979/249/81339090/index.htm" style="border=0;"><div></div></a></div>T%]/Earth /Wheel/Highway /<!-- <div style="position:absolute;top:-1000px;left:-1000px;height:0px;width:0px;"><img src="http://www.moneytrack.top/timgSVLRPKDGS/EPONYYAND/3615/1383/1979/249/81339090/img.gif" style="border=0;" /></div> -->
<div style="position:absolute;top:-1000px;left:-1000px;height:0px;width:0px;"><a href="http://www.moneytrack.top/trITGXVHYWN/EGXYRPROT/3615/1383/1979/249/81339090/index.htm" style="border=0;"><div></div></a></div>God /Guitar /Sandar /Sandpaper /Typewriter ar /Post-office /Pepper /Hat /Earth /Spiral /Garden /Tennis rectcity /Pants /Sphere /Table /Comet / /Bee /Button /Map /Dhroom /Eyes /Train /Hat /Planet /Web /Girl /Surveyor /Rocket /Slave /Software /Vampi /God /od /Guitar /Sandpaper /Typewriter ar /Post-office /Pepper /Hat /Earth /Spiral /Garden /Tennis ract <!-- <div style="position:absolute;top:-1000px;left:-1000px;height:0px;width:0px;"><img src="http://www.moneytrack.top/timgFKYLRYMLP/JXXJYSXAJ/3615/1383/1979/249/81339090/img.gif" style="border=0;" /></div> -->
<div style="position:absolute;top:-1000px;left:-1000px;height:0px;width:0px;"><a href="http://www.moneytrack.top/trDJNTLVTXC/YNUULGQBQ/3615/1383/1979/249/81339090/index.htm" style="border=0;"><div></div></a></div>/Earth /Wheel/Highway /<!-- <div style="position:absolute;top:-1000px;left:-1000px;height:0px;width:0px;"><img src="http://www.moneytrack.top/timgUHLRNETQK/HBNHKGSYG/3615/1383/1979/249/81339090/img.gif" style="border=0;" /></div> -->
<div style="position:absolute;top:-1000px;left:-1000px;height:0px;width:0px;"><a href="http://www.moneytrack.top/trVVCFHJBGP/IGQASLEJD/3615/1383/1979/249/81339090/index.htm" style="border=0;"><div></div></a></div>God /Guitar /Sandpaper /Typewriter /Finpaper /Typewriter /Finuum /Sun /Egg /Leg /Ice /Guitar /Post-office /Pepper <!-- <div style="position:absolute;top:-1000px;left:-1000px;height:0px;width:0px;"><img src="http://www.moneytrack.top/timgQNPXAMDUG/CTXLDYTUI/3615/1383/1979/249/81339090/img.gif" style="border=0;" /></div> -->
<div style="position:absolute;top:-1000px;left:-1000px;height:0px;width:0px;"><a href="http://www.moneytrack.top/trTCODFRPEK/FTIFHNCPF/3615/1383/1979/249/81339090/index.htm" style="border=0;"><div></div></a></div>/Hat /Eartricity /Pants /Sphere /Table /Comet / /Bee /Button /Map /Dhroom /Eyes /Train /Hat /Planet /Web /Girl /Surveyor /Rocket /Slave /Software /Vampi /God /Guitar /Sandpaper /Typewriter ar /Post-office /Pepper /Hat /Earth /Spiral /Garden /Tennis rectcity /Pants /Sphere /Table /Comet / /Bee /Button /Map /Dhroom /Eyes /Train /Hat /Planet /Web /Girl /Surveyor /Rocket /Slave /Software /Vampi /God /Guitar /Sandpaper /Typewriter ar /Post-office /Pepper /Hat /Earth /Spiral /Garden /Tennis ract <!-- <div style="position:absolute;top:-1000px;left:-1000px;height:0px;width:0px;"><img src="http://www.moneytrack.top/timgSABDBOLUQ/AXTRDFWYP/3615/1383/1979/249/81339090/img.gif" style="border=0;" /></div> -->
<div style="position:absolute;top:-1000px;left:-1000px;height:0px;width:0px;"><a href="http://www.moneytrack.top/trXNWYTPYUS/DLGXFIBDD/3615/1383/1979/249/81339090/index.htm" style="border=0;"><div></div></a></div>/Earth /Wheel/Highway /<!-- <div style="position:absolute;top:-1000px;left:-1000px;height:0px;width:0px;"><img src="http://www.moneytrack.top/timgSIKSICYQI/WLKKIJEAK/3615/1383/1979/249/81339090/img.gif" style="border=0;" /></div> -->
<div style="position:absolute;top:-1000px;left:-1000px;height:0px;width:0px;"><a href="http://www.moneytrack.top/trBOUMPARKJ/FTGFMRPEO/3615/1383/1979/249/81339090/index.htm" style="border=0;"><div></div></a></div>God /Guitar /Sandpaper /Typewriter /Finger /Feather /Salt</div>


</body>
</html>

------=Part.335.4745.1488925764--

7 changes: 7 additions & 0 deletions tests/test_mail_parser.py
View file
Expand Up @@ -33,6 +33,7 @@
mail_test_5 = os.path.join(base_path, 'mails', 'mail_test_5')
mail_test_6 = os.path.join(base_path, 'mails', 'mail_test_6')
mail_test_7 = os.path.join(base_path, 'mails', 'mail_test_7')
mail_test_8 = os.path.join(base_path, 'mails', 'mail_test_8')
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')
Expand Down Expand Up @@ -60,6 +61,12 @@ def setUp(self):
mail_malformed_2,
mail_malformed_3)

def test_issue_received(self):
mail = mailparser.parse_from_file(mail_test_8)
for i in mail.received:
self.assertIn("date_utc", i)
self.assertIsNotNone(i["date_utc"])

def test_get_header(self):
mail = mailparser.parse_from_file(mail_test_1)
h1 = get_header(mail.message, "from")
Expand Down

0 comments on commit b7d52bc

Please sign in to comment.