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 7524479

Browse filesBrowse files
selwinselwin
committed
Adds compatibility to ua-parser 0.4.0.
1 parent 3dede6f commit 7524479
Copy full SHA for 7524479

File tree

Expand file treeCollapse file tree

2 files changed

+16
-15
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+16
-15
lines changed

‎user_agents/parsers.py

Copy file name to clipboardExpand all lines: user_agents/parsers.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ def parse_operating_system(family, major=None, minor=None, patch=None, patch_min
9090
return OperatingSystem(family, version, version_string)
9191

9292

93-
Device = namedtuple('Device', ['family'])
93+
Device = namedtuple('Device', ['family', 'brand', 'model'])
9494

9595

96-
def parse_device(family):
97-
return Device(family)
96+
def parse_device(family, brand, model):
97+
return Device(family, brand, model)
9898

9999

100100
class UserAgent(object):

‎user_agents/tests.py

Copy file name to clipboardExpand all lines: user_agents/tests.py
+13-12Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import unittest
22

33
from ua_parser import user_agent_parser
4-
from .parsers import parse, UserAgent
4+
from .parsers import parse
55

66

77
iphone_ua_string = 'Mozilla/5.0 (iPhone; CPU iPhone OS 5_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B179 Safari/7534.48.3'
@@ -59,9 +59,10 @@ def test_user_agent_object_assignments(self):
5959
ua_dict['user_agent']['family'])
6060
self.assertEqual(
6161
iphone_ua.browser.version,
62-
(int(ua_dict['user_agent']['major']), int(ua_dict['user_agent']['minor']))
62+
(int(ua_dict['user_agent']['major']),
63+
int(ua_dict['user_agent']['minor']))
6364
)
64-
65+
6566
# Ensure os attributes are assigned correctly
6667
self.assertEqual(iphone_ua.os.family, ua_dict['os']['family'])
6768
self.assertEqual(
@@ -145,7 +146,7 @@ def test_is_pc(self):
145146
self.assertFalse(nexus_7_ua.is_pc)
146147
self.assertFalse(windows_phone_ua.is_pc)
147148
self.assertFalse(blackberry_bold_touch_ua.is_pc)
148-
self.assertFalse(blackberry_torch_ua.is_pc)
149+
self.assertFalse(blackberry_torch_ua.is_pc)
149150
self.assertFalse(blackberry_bold_ua.is_pc)
150151
self.assertFalse(j2me_opera_ua.is_pc)
151152
self.assertFalse(google_bot_ua.is_pc)
@@ -167,9 +168,9 @@ def test_is_bot(self):
167168
self.assertFalse(nexus_7_ua.is_bot)
168169
self.assertFalse(windows_phone_ua.is_bot)
169170
self.assertFalse(blackberry_bold_touch_ua.is_bot)
170-
self.assertFalse(blackberry_torch_ua.is_bot)
171+
self.assertFalse(blackberry_torch_ua.is_bot)
171172
self.assertFalse(blackberry_bold_ua.is_bot)
172-
self.assertFalse(j2me_opera_ua.is_bot)
173+
self.assertFalse(j2me_opera_ua.is_bot)
173174
self.assertFalse(mac_safari_ua.is_bot)
174175
self.assertFalse(windows_ie_ua.is_bot)
175176
self.assertFalse(ubuntu_firefox_ua.is_bot)
@@ -181,25 +182,25 @@ def test_is_bot(self):
181182
def test_strings(self):
182183
self.assertEqual(str(iphone_ua), "iPhone / iOS 5.1 / Mobile Safari 5.1")
183184
self.assertEqual(str(ipad_ua), "iPad / iOS 3.2 / Mobile Safari 4.0.4")
184-
self.assertEqual(str(galaxy_tab), "SCH-I800 / Android 2.2 / Android 2.2")
185-
self.assertEqual(str(galaxy_s3_ua), "GT-I9300 / Android 4.0.4 / Android 4.0.4")
186-
self.assertEqual(str(kindle_fire_ua), "Kindle Fire / Android / Amazon Silk 1.1.0-80")
185+
self.assertEqual(str(galaxy_tab), "Samsung SCH-I800 / Android 2.2 / Android 2.2")
186+
self.assertEqual(str(galaxy_s3_ua), "Samsung GT-I9300 / Android 4.0.4 / Android 4.0.4")
187+
self.assertEqual(str(kindle_fire_ua), "Kindle / Android / Amazon Silk 1.1.0-80")
187188
self.assertEqual(str(playbook_ua), "BlackBerry Playbook / BlackBerry Tablet OS 2.0.1 / BlackBerry WebKit 2.0.1")
188-
self.assertEqual(str(nexus_7_ua), "Nexus 7 / Android 4.1.1 / Chrome 18.0.1025")
189+
self.assertEqual(str(nexus_7_ua), "Asus Nexus 7 / Android 4.1.1 / Chrome 18.0.1025")
189190
self.assertEqual(str(windows_phone_ua), "Samsung SGH-i917 / Windows Phone 7.5 / IE Mobile 9")
190191
self.assertEqual(str(windows_rt_ua), "PC / Windows RT / IE 10")
191192
self.assertEqual(str(blackberry_torch_ua), "BlackBerry 9800 / BlackBerry OS 6 / BlackBerry WebKit 6")
192193
self.assertEqual(str(blackberry_bold_ua), "BlackBerry 9700 / BlackBerry OS 5 / BlackBerry 9700")
193194
self.assertEqual(str(blackberry_bold_touch_ua), "BlackBerry 9930 / BlackBerry OS 7 / BlackBerry WebKit 7")
194-
self.assertEqual(str(j2me_opera_ua), "Other / Other / Opera Mini 9.80")
195+
self.assertEqual(str(j2me_opera_ua), "Generic Feature Phone / Other / Opera Mini 9.80")
195196
self.assertEqual(str(ie_ua), "PC / Windows 8 / IE 10")
196197
self.assertEqual(str(ie_touch_ua), "PC / Windows 8 / IE 10")
197198
self.assertEqual(str(mac_safari_ua), "PC / Mac OS X 10.6.8 / WebKit Nightly 537.13")
198199
self.assertEqual(str(windows_ie_ua), "PC / Windows 7 / IE 9")
199200
self.assertEqual(str(ubuntu_firefox_ua), "PC / Ubuntu / Firefox 15.0.1")
200201
self.assertEqual(str(google_bot_ua), "Spider / Other / Googlebot 2.1")
201202
self.assertEqual(str(nokia_n97_ua), "Nokia N97 / Symbian OS 9.4 / Nokia Browser 7.1.12344")
202-
self.assertEqual(str(android_firefox_aurora_ua), "Other / Android / Firefox Mobile 27")
203+
self.assertEqual(str(android_firefox_aurora_ua), "Generic Smartphone / Android / Firefox Mobile 27")
203204

204205
def test_unicode_strings(self):
205206
try:

0 commit comments

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