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 5977783

Browse filesBrowse files
committed
Merge branch 'master' of github.com:selwin/python-user-agents
2 parents 8745b25 + 684a37c commit 5977783
Copy full SHA for 5977783

File tree

2 files changed

+16
-13
lines changed
Filter options

2 files changed

+16
-13
lines changed

‎user_agents/parsers.py

Copy file name to clipboardExpand all lines: user_agents/parsers.py
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
'Generic Smartphone',
1111
'Generic Feature Phone',
1212
'PlayStation Vita',
13+
'iOS-Device'
1314
)
1415

1516
PC_OS_FAMILIES = (
@@ -97,7 +98,9 @@ def parse_version(major=None, minor=None, patch=None, patch_minor=None):
9798
patch = verify_attribute(patch)
9899
patch_minor = verify_attribute(patch_minor)
99100

100-
return tuple(filter(None, (major, minor, patch, patch_minor)))
101+
return tuple(
102+
filter(lambda x: x is not None, (major, minor, patch, patch_minor))
103+
)
101104

102105

103106
Browser = namedtuple('Browser', ['family', 'version', 'version_string'])

‎user_agents/tests.py

Copy file name to clipboardExpand all lines: user_agents/tests.py
+12-12Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ def test_is_email_client(self):
207207
self.assertFalse(ie_touch_ua.is_email_client)
208208
self.assertFalse(ie_ua.is_email_client)
209209
self.assertFalse(nokia_n97_ua.is_email_client)
210-
self.assertFalse(android_firefox_aurora_ua.is_email_client)
211-
212-
210+
self.assertFalse(android_firefox_aurora_ua.is_email_client)
211+
212+
213213
def test_strings(self):
214214
self.assertEqual(str(iphone_ua), "iPhone / iOS 5.1 / Mobile Safari 5.1")
215215
self.assertEqual(str(ipad_ua), "iPad / iOS 3.2 / Mobile Safari 4.0.4")
@@ -218,20 +218,20 @@ def test_strings(self):
218218
self.assertEqual(str(kindle_fire_ua), "Kindle / Android / Amazon Silk 1.1.0-80")
219219
self.assertEqual(str(playbook_ua), "BlackBerry Playbook / BlackBerry Tablet OS 2.0.1 / BlackBerry WebKit 2.0.1")
220220
self.assertEqual(str(nexus_7_ua), "Asus Nexus 7 / Android 4.1.1 / Chrome 18.0.1025")
221-
self.assertEqual(str(windows_phone_ua), "Samsung SGH-i917 / Windows Phone 7.5 / IE Mobile 9")
222-
self.assertEqual(str(windows_rt_ua), "PC / Windows RT / IE 10")
223-
self.assertEqual(str(blackberry_torch_ua), "BlackBerry 9800 / BlackBerry OS 6 / BlackBerry WebKit 6")
224-
self.assertEqual(str(blackberry_bold_ua), "BlackBerry 9700 / BlackBerry OS 5 / BlackBerry 9700")
225-
self.assertEqual(str(blackberry_bold_touch_ua), "BlackBerry 9930 / BlackBerry OS 7 / BlackBerry WebKit 7")
221+
self.assertEqual(str(windows_phone_ua), "Samsung SGH-i917 / Windows Phone 7.5 / IE Mobile 9.0")
222+
self.assertEqual(str(windows_rt_ua), "PC / Windows RT / IE 10.0")
223+
self.assertEqual(str(blackberry_torch_ua), "BlackBerry 9800 / BlackBerry OS 6.0.0 / BlackBerry WebKit 6.0.0")
224+
self.assertEqual(str(blackberry_bold_ua), "BlackBerry 9700 / BlackBerry OS 5.0.0 / BlackBerry 9700")
225+
self.assertEqual(str(blackberry_bold_touch_ua), "BlackBerry 9930 / BlackBerry OS 7.0.0 / BlackBerry WebKit 7.0.0")
226226
self.assertEqual(str(j2me_opera_ua), "Generic Feature Phone / Other / Opera Mini 9.80")
227-
self.assertEqual(str(ie_ua), "PC / Windows 8 / IE 10")
228-
self.assertEqual(str(ie_touch_ua), "PC / Windows 8 / IE 10")
227+
self.assertEqual(str(ie_ua), "PC / Windows 8 / IE 10.0")
228+
self.assertEqual(str(ie_touch_ua), "PC / Windows 8 / IE 10.0")
229229
self.assertEqual(str(mac_safari_ua), "PC / Mac OS X 10.6.8 / WebKit Nightly 537.13")
230-
self.assertEqual(str(windows_ie_ua), "PC / Windows 7 / IE 9")
230+
self.assertEqual(str(windows_ie_ua), "PC / Windows 7 / IE 9.0")
231231
self.assertEqual(str(ubuntu_firefox_ua), "PC / Ubuntu / Firefox 15.0.1")
232232
self.assertEqual(str(google_bot_ua), "Spider / Other / Googlebot 2.1")
233233
self.assertEqual(str(nokia_n97_ua), "Nokia N97 / Symbian OS 9.4 / Nokia Browser 7.1.12344")
234-
self.assertEqual(str(android_firefox_aurora_ua), "Generic Smartphone / Android / Firefox Mobile 27")
234+
self.assertEqual(str(android_firefox_aurora_ua), "Generic Smartphone / Android / Firefox Mobile 27.0")
235235

236236
def test_unicode_strings(self):
237237
try:

0 commit comments

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