From 85d09629e1d6d3ba275ee5dc7076db06b1e8cea1 Mon Sep 17 00:00:00 2001 From: Alexander Chermenin Date: Thu, 22 Oct 2020 15:54:27 +0500 Subject: [PATCH 1/3] Fixed test test_is_touch_property --- user_agents/tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_agents/tests.py b/user_agents/tests.py index 345cf82..a6c1307 100644 --- a/user_agents/tests.py +++ b/user_agents/tests.py @@ -135,8 +135,8 @@ def test_is_touch_property(self): self.assertTrue(nexus_7_ua.is_touch_capable) self.assertTrue(windows_phone_ua.is_touch_capable) self.assertTrue(ie_touch_ua.is_touch_capable) - self.assertTrue(blackberry_bold_touch_ua.is_mobile) - self.assertTrue(blackberry_torch_ua.is_mobile) + self.assertFalse(blackberry_bold_touch_ua.is_touch_capable) + self.assertFalse(blackberry_torch_ua.is_touch_capable) self.assertFalse(j2me_opera_ua.is_touch_capable) self.assertFalse(ie_ua.is_touch_capable) self.assertFalse(blackberry_bold_ua.is_touch_capable) From 1325177360c674baaba32201a6fc08c57d04c36b Mon Sep 17 00:00:00 2001 From: Alexander Chermenin Date: Tue, 30 Mar 2021 12:25:00 +0500 Subject: [PATCH 2/3] Fix for BlackBerry Touch devices --- user_agents/devices.json | 2 +- user_agents/parsers.py | 4 ++-- user_agents/tests.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/user_agents/devices.json b/user_agents/devices.json index c8b7efe..e6601bf 100644 --- a/user_agents/devices.json +++ b/user_agents/devices.json @@ -22,7 +22,7 @@ "is_mobile": true, "is_pc": false, "is_tablet": false, - "is_touch_capable": false, + "is_touch_capable": true, "ua_string": "Mozilla/5.0 (BlackBerry; U; BlackBerry 9930; en-US) AppleWebKit/534.11+ (KHTML, like Gecko) Version/7.0.0.241 Mobile Safari/534.11+", "str": "BlackBerry 9930 / BlackBerry OS 7 / BlackBerry WebKit 7" }, diff --git a/user_agents/parsers.py b/user_agents/parsers.py index 8fcae30..18cabf8 100644 --- a/user_agents/parsers.py +++ b/user_agents/parsers.py @@ -160,9 +160,9 @@ def _is_android_tablet(self): def _is_blackberry_touch_capable_device(self): # A helper to determine whether a BB phone has touch capabilities # Blackberry Bold Touch series begins with 99XX - if 'Blackberry 99' in self.device.family: + if 'blackberry 99' in self.device.family.lower(): return True - if 'Blackberry 95' in self.device.family: # BB Storm devices + if 'blackberry 95' in self.device.family.lower(): # BB Storm devices return True return False diff --git a/user_agents/tests.py b/user_agents/tests.py index a6c1307..a9f03aa 100644 --- a/user_agents/tests.py +++ b/user_agents/tests.py @@ -135,7 +135,7 @@ def test_is_touch_property(self): self.assertTrue(nexus_7_ua.is_touch_capable) self.assertTrue(windows_phone_ua.is_touch_capable) self.assertTrue(ie_touch_ua.is_touch_capable) - self.assertFalse(blackberry_bold_touch_ua.is_touch_capable) + self.assertTrue(blackberry_bold_touch_ua.is_touch_capable) self.assertFalse(blackberry_torch_ua.is_touch_capable) self.assertFalse(j2me_opera_ua.is_touch_capable) self.assertFalse(ie_ua.is_touch_capable) From 378c8efa3fb5bb3281c4a4ac113c1050e7bb8f8c Mon Sep 17 00:00:00 2001 From: Alexander Chermenin Date: Tue, 30 Mar 2021 12:28:55 +0500 Subject: [PATCH 3/3] Fix for BlackBerry Torch devices --- user_agents/devices.json | 2 +- user_agents/parsers.py | 3 +++ user_agents/tests.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/user_agents/devices.json b/user_agents/devices.json index e6601bf..f12bd2d 100644 --- a/user_agents/devices.json +++ b/user_agents/devices.json @@ -31,7 +31,7 @@ "is_mobile": true, "is_pc": false, "is_tablet": false, - "is_touch_capable": false, + "is_touch_capable": true, "ua_string": "Mozilla/5.0 (BlackBerry; U; BlackBerry 9800; zh-TW) AppleWebKit/534.8+ (KHTML, like Gecko) Version/6.0.0.448 Mobile Safari/534.8+", "str": "BlackBerry 9800 / BlackBerry OS 6 / BlackBerry WebKit 6" }, diff --git a/user_agents/parsers.py b/user_agents/parsers.py index 18cabf8..d4ae5d2 100644 --- a/user_agents/parsers.py +++ b/user_agents/parsers.py @@ -162,6 +162,9 @@ def _is_blackberry_touch_capable_device(self): # Blackberry Bold Touch series begins with 99XX if 'blackberry 99' in self.device.family.lower(): return True + # Blackberry Torch series begins with 98XX + if 'blackberry 98' in self.device.family.lower(): + return True if 'blackberry 95' in self.device.family.lower(): # BB Storm devices return True return False diff --git a/user_agents/tests.py b/user_agents/tests.py index a9f03aa..31b1f5b 100644 --- a/user_agents/tests.py +++ b/user_agents/tests.py @@ -136,7 +136,7 @@ def test_is_touch_property(self): self.assertTrue(windows_phone_ua.is_touch_capable) self.assertTrue(ie_touch_ua.is_touch_capable) self.assertTrue(blackberry_bold_touch_ua.is_touch_capable) - self.assertFalse(blackberry_torch_ua.is_touch_capable) + self.assertTrue(blackberry_torch_ua.is_touch_capable) self.assertFalse(j2me_opera_ua.is_touch_capable) self.assertFalse(ie_ua.is_touch_capable) self.assertFalse(blackberry_bold_ua.is_touch_capable)