Skip to content

Commit 1ad42f3

Browse files
mbeijenmbeijen
authored
Merge pull request #187 from ataylor32/platforms
When identifying a macOS or Windows platform, do not include the version
2 parents 6fc87ce + bf0d675 commit 1ad42f3

File tree

2 files changed

+34
-47
lines changed

2 files changed

+34
-47
lines changed

‎tests/test_template_filters.py‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -49,46 +49,46 @@ def test_locations(self):
4949
class PlatformTemplateFilterTest(TestCase):
5050
def test_windows(self):
5151
# Generic Windows
52-
self.assertEqual("Windows XP", platform("NT 5.1 not a real browser/10.3"))
53-
self.assertEqual("Windows Vista", platform("NT 6.0 not a real browser/10.3"))
54-
self.assertEqual("Windows 7", platform("NT 6.1 not a real browser/10.3"))
55-
self.assertEqual("Windows 8", platform("NT 6.2 not a real browser/10.3"))
56-
self.assertEqual("Windows 8.1", platform("NT 6.3 not a real browser/10.3"))
52+
self.assertEqual("Windows", platform("Windows NT 5.1 not a real browser/10.3"))
53+
self.assertEqual("Windows", platform("Windows NT 6.0 not a real browser/10.3"))
54+
self.assertEqual("Windows", platform("Windows NT 6.1 not a real browser/10.3"))
55+
self.assertEqual("Windows", platform("Windows NT 6.2 not a real browser/10.3"))
56+
self.assertEqual("Windows", platform("Windows NT 6.3 not a real browser/10.3"))
5757
self.assertEqual("Windows", platform("Windows not a real browser/10.3"))
5858

5959
# IE
6060
self.assertEqual(
61-
'Windows XP',
61+
'Windows',
6262
platform('Mozilla/4.0 (Windows; MSIE 6.0; Windows NT 5.1; SV1; '
6363
'.NET CLR 2.0.50727)')
6464
)
6565
self.assertEqual(
66-
'Windows Vista',
66+
'Windows',
6767
platform('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; '
6868
'Trident/4.0; SLCC1; .NET CLR 2.0.50727; .NET CLR 1.1.4322;'
6969
' InfoPath.2; .NET CLR 3.5.21022; .NET CLR 3.5.30729; '
7070
'MS-RTC LM 8; OfficeLiveConnector.1.4; OfficeLivePatch.1.3;'
7171
' .NET CLR 3.0.30729)')
7272
)
7373
self.assertEqual(
74-
'Windows 7',
74+
'Windows',
7575
platform('Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; '
7676
'Trident/6.0)')
7777
)
7878
self.assertEqual(
79-
'Windows 8',
79+
'Windows',
8080
platform('Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; '
8181
'Win64; x64; Trident/6.0)')
8282
)
8383
self.assertEqual(
84-
'Windows 8.1',
84+
'Windows',
8585
platform('Mozilla/5.0 (IE 11.0; Windows NT 6.3; Trident/7.0; '
8686
'.NET4.0E; .NET4.0C; rv:11.0) like Gecko')
8787
)
8888

8989
# Edge
9090
self.assertEqual(
91-
'Windows 10',
91+
'Windows',
9292
platform('Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, '
9393
'like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10136')
9494
)
@@ -101,22 +101,22 @@ def test_windows(self):
101101

102102
# Edge Chromium
103103
self.assertEqual(
104-
'Windows 10',
104+
'Windows',
105105
platform('Mozilla/5.0 (Windows NT 10.0; Win64; x64) '
106106
'AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.113 '
107107
'Safari/537.36 Edg/81.0.416.62')
108108
)
109109

110110
# Firefox
111111
self.assertEqual(
112-
'Windows 7',
112+
'Windows',
113113
platform('Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:22.0) '
114114
'Gecko/20130328 Firefox/22.0')
115115
)
116116

117117
# Chrome
118118
self.assertEqual(
119-
'Windows 8.1',
119+
'Windows',
120120
platform('Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 ('
121121
'KHTML, like Gecko) Chrome/30.0.1599.101 Safari/537.36')
122122
)
@@ -143,13 +143,13 @@ def test_apple(self):
143143
)
144144

145145
self.assertEqual(
146-
'macOS Mojave',
146+
'macOS',
147147
platform('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) '
148148
'AppleWebKit/537.36 (KHTML, like Gecko) '
149149
'Chrome/85.0.4178.0 Safari/537.36')
150150
)
151151
self.assertEqual(
152-
'macOS Catalina',
152+
'macOS',
153153
platform('Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:77.0) '
154154
'Gecko/20100101 Firefox/77.0')
155155
)
@@ -162,7 +162,7 @@ def test_apple(self):
162162

163163
# Edge Chromium
164164
self.assertEqual(
165-
'macOS Catalina',
165+
'macOS',
166166
platform('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) '
167167
'AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.102 '
168168
'Safari/537.36 Edg/85.0.564.51')
@@ -319,30 +319,30 @@ def test_android(self):
319319
class DeviceTemplateFilterTest(TestCase):
320320
def test_ie(self):
321321
self.assertEqual(
322-
'Internet Explorer on Windows XP',
322+
'Internet Explorer on Windows',
323323
device('Mozilla/4.0 (Windows; MSIE 6.0; Windows NT 5.1; SV1; '
324324
'.NET CLR 2.0.50727)')
325325
)
326326
self.assertEqual(
327-
'Internet Explorer on Windows Vista',
327+
'Internet Explorer on Windows',
328328
device('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; '
329329
'Trident/4.0; SLCC1; .NET CLR 2.0.50727; .NET CLR 1.1.4322;'
330330
' InfoPath.2; .NET CLR 3.5.21022; .NET CLR 3.5.30729; '
331331
'MS-RTC LM 8; OfficeLiveConnector.1.4; OfficeLivePatch.1.3;'
332332
' .NET CLR 3.0.30729)')
333333
)
334334
self.assertEqual(
335-
'Internet Explorer on Windows 7',
335+
'Internet Explorer on Windows',
336336
device('Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; '
337337
'Trident/6.0)')
338338
)
339339
self.assertEqual(
340-
'Internet Explorer on Windows 8',
340+
'Internet Explorer on Windows',
341341
device('Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; '
342342
'Win64; x64; Trident/6.0)')
343343
)
344344
self.assertEqual(
345-
'Internet Explorer on Windows 8.1',
345+
'Internet Explorer on Windows',
346346
device('Mozilla/5.0 (IE 11.0; Windows NT 6.3; Trident/7.0; '
347347
'.NET4.0E; .NET4.0C; rv:11.0) like Gecko')
348348
)
@@ -361,13 +361,13 @@ def test_apple(self):
361361
'Mobile/11A465 Safari/9537.53')
362362
)
363363
self.assertEqual(
364-
'Chrome on macOS Mojave',
364+
'Chrome on macOS',
365365
device('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) '
366366
'AppleWebKit/537.36 (KHTML, like Gecko) '
367367
'Chrome/85.0.4178.0 Safari/537.36')
368368
)
369369
self.assertEqual(
370-
'Firefox on macOS Catalina',
370+
'Firefox on macOS',
371371
device('Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:77.0) '
372372
'Gecko/20100101 Firefox/77.0')
373373
)
@@ -389,21 +389,21 @@ def test_android(self):
389389

390390
def test_firefox(self):
391391
self.assertEqual(
392-
'Firefox on Windows 7',
392+
'Firefox on Windows',
393393
device('Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:22.0) '
394394
'Gecko/20130328 Firefox/22.0')
395395
)
396396

397397
def test_chrome(self):
398398
self.assertEqual(
399-
'Chrome on Windows 8.1',
399+
'Chrome on Windows',
400400
device('Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 ('
401401
'KHTML, like Gecko) Chrome/30.0.1599.101 Safari/537.36')
402402
)
403403

404404
def test_edge(self):
405405
self.assertEqual(
406-
'Edge on Windows 10',
406+
'Edge on Windows',
407407
device('Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36 (KHTML, '
408408
'like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.10136')
409409
)
@@ -416,13 +416,13 @@ def test_edge(self):
416416

417417
def test_edge_chromium(self):
418418
self.assertEqual(
419-
'Edge on Windows 10',
419+
'Edge on Windows',
420420
device('Mozilla/5.0 (Windows NT 10.0; Win64; x64) '
421421
'AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.113 '
422422
'Safari/537.36 Edg/81.0.416.62')
423423
)
424424
self.assertEqual(
425-
'Edge on macOS Catalina',
425+
'Edge on macOS',
426426
device('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) '
427427
'AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.102 '
428428
'Safari/537.36 Edg/85.0.564.51')
@@ -453,19 +453,19 @@ def test_iphone_only(self):
453453
self.assertEqual("iPhone", device("iPhone not a real browser/10.3"))
454454

455455
def test_windowsxp_only(self):
456-
self.assertEqual("Windows XP", device("NT 5.1 not a real browser/10.3"))
456+
self.assertEqual("Windows", device("Windows NT 5.1 not a real browser/10.3"))
457457

458458
def test_windowsvista_only(self):
459-
self.assertEqual("Windows Vista", device("NT 6.0 not a real browser/10.3"))
459+
self.assertEqual("Windows", device("Windows NT 6.0 not a real browser/10.3"))
460460

461461
def test_windows7_only(self):
462-
self.assertEqual("Windows 7", device("NT 6.1 not a real browser/10.3"))
462+
self.assertEqual("Windows", device("Windows NT 6.1 not a real browser/10.3"))
463463

464464
def test_windows8_only(self):
465-
self.assertEqual("Windows 8", device("NT 6.2 not a real browser/10.3"))
465+
self.assertEqual("Windows", device("Windows NT 6.2 not a real browser/10.3"))
466466

467467
def test_windows81_only(self):
468-
self.assertEqual("Windows 8.1", device("NT 6.3 not a real browser/10.3"))
468+
self.assertEqual("Windows", device("Windows NT 6.3 not a real browser/10.3"))
469469

470470
def test_windows_only(self):
471471
self.assertEqual("Windows", device("Windows not a real browser/10.3"))

‎user_sessions/templatetags/user_sessions.py‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,7 @@
2121
(re.compile('Linux'), _('Linux')),
2222
(re.compile('iPhone'), _('iPhone')),
2323
(re.compile('iPad'), _('iPad')),
24-
(re.compile('Mac OS X 10[._]9'), _('OS X Mavericks')),
25-
(re.compile('Mac OS X 10[._]10'), _('OS X Yosemite')),
26-
(re.compile('Mac OS X 10[._]11'), _('OS X El Capitan')),
27-
(re.compile('Mac OS X 10[._]12'), _('macOS Sierra')),
28-
(re.compile('Mac OS X 10[._]13'), _('macOS High Sierra')),
29-
(re.compile('Mac OS X 10[._]14'), _('macOS Mojave')),
30-
(re.compile('Mac OS X 10[._]15'), _('macOS Catalina')),
3124
(re.compile('Mac OS X'), _('macOS')),
32-
(re.compile('NT 5.1'), _('Windows XP')),
33-
(re.compile('NT 6.0'), _('Windows Vista')),
34-
(re.compile('NT 6.1'), _('Windows 7')),
35-
(re.compile('NT 6.2'), _('Windows 8')),
36-
(re.compile('NT 6.3'), _('Windows 8.1')),
37-
(re.compile('NT 10.0'), _('Windows 10')),
3825
(re.compile('Windows'), _('Windows')),
3926
)
4027

0 commit comments

Comments
 (0)