Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 8c3c05c

Browse filesBrowse files
authored
Merge pull request selwin#63 from k-wojcik/is_email_client
New property is_email_client
2 parents 778f0cf + 623f814 commit 8c3c05c
Copy full SHA for 8c3c05c

File tree

Expand file treeCollapse file tree

2 files changed

+47
-0
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+47
-0
lines changed

‎user_agents/parsers.py

Copy file name to clipboardExpand all lines: user_agents/parsers.py
+23Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,24 @@
6464
'Kindle Fire',
6565
)
6666

67+
EMAIL_PROGRAM_FAMILIES = {
68+
'Outlook',
69+
'Windows Live Mail',
70+
'AirMail',
71+
'Apple Mail',
72+
'Outlook',
73+
'Thunderbird',
74+
'Lightning',
75+
'ThunderBrowse',
76+
'Windows Live Mail',
77+
'The Bat!',
78+
'Lotus Notes',
79+
'IBM Notes',
80+
'Barca',
81+
'MailBar',
82+
'kmail2',
83+
'YahooMobileMail'
84+
}
6785

6886
def verify_attribute(attribute):
6987
if isinstance(attribute, string_types) and attribute.isdigit():
@@ -221,6 +239,11 @@ def is_pc(self):
221239
def is_bot(self):
222240
return True if self.device.family == 'Spider' else False
223241

242+
@property
243+
def is_email_client(self):
244+
if self.browser.family in EMAIL_PROGRAM_FAMILIES:
245+
return True
246+
return False
224247

225248
def parse(user_agent_string):
226249
return UserAgent(user_agent_string)

‎user_agents/tests.py

Copy file name to clipboardExpand all lines: user_agents/tests.py
+24Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
google_bot_ua_string = 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)'
2929
nokia_n97_ua_string = 'Mozilla/5.0 (SymbianOS/9.4; Series60/5.0 NokiaN97-1/12.0.024; Profile/MIDP-2.1 Configuration/CLDC-1.1; en-us) AppleWebKit/525 (KHTML, like Gecko) BrowserNG/7.1.12344'
3030
android_firefox_aurora_ua_string = 'Mozilla/5.0 (Android; Mobile; rv:27.0) Gecko/27.0 Firefox/27.0'
31+
thunderbird_ua_string = 'Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 Lightning/4.0.2'
32+
outlook_usa_string = 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; Trident/6.0; Microsoft Outlook 15.0.4420)'
3133

3234
iphone_ua = parse(iphone_ua_string)
3335
ipad_ua = parse(ipad_ua_string)
@@ -50,6 +52,8 @@
5052
google_bot_ua = parse(google_bot_ua_string)
5153
nokia_n97_ua = parse(nokia_n97_ua_string)
5254
android_firefox_aurora_ua = parse(android_firefox_aurora_ua_string)
55+
thunderbird_ua = parse(thunderbird_ua_string)
56+
outlook_ua = parse(outlook_usa_string)
5357

5458

5559
class UserAgentsTest(unittest.TestCase):
@@ -183,6 +187,26 @@ def test_is_bot(self):
183187
self.assertFalse(nokia_n97_ua.is_bot)
184188
self.assertFalse(android_firefox_aurora_ua.is_bot)
185189

190+
def test_is_email_client(self):
191+
self.assertTrue(thunderbird_ua.is_email_client)
192+
self.assertTrue(outlook_ua.is_email_client)
193+
self.assertFalse(playbook_ua.is_email_client)
194+
self.assertFalse(kindle_fire_ua.is_email_client)
195+
self.assertFalse(nexus_7_ua.is_email_client)
196+
self.assertFalse(windows_phone_ua.is_email_client)
197+
self.assertFalse(blackberry_bold_touch_ua.is_email_client)
198+
self.assertFalse(blackberry_torch_ua.is_email_client)
199+
self.assertFalse(blackberry_bold_ua.is_email_client)
200+
self.assertFalse(j2me_opera_ua.is_email_client)
201+
self.assertFalse(mac_safari_ua.is_email_client)
202+
self.assertFalse(windows_ie_ua.is_email_client)
203+
self.assertFalse(ubuntu_firefox_ua.is_email_client)
204+
self.assertFalse(ie_touch_ua.is_email_client)
205+
self.assertFalse(ie_ua.is_email_client)
206+
self.assertFalse(nokia_n97_ua.is_email_client)
207+
self.assertFalse(android_firefox_aurora_ua.is_email_client)
208+
209+
186210
def test_strings(self):
187211
self.assertEqual(str(iphone_ua), "iPhone / iOS 5.1 / Mobile Safari 5.1")
188212
self.assertEqual(str(ipad_ua), "iPad / iOS 3.2 / Mobile Safari 4.0.4")

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.