Skip to content

Commit 566971a

Browse files
levkowetzlevkowetz
committed
Removed further six usage.
 - Legacy-Id: 17386
1 parent e9a37d8 commit 566971a

12 files changed

Lines changed: 28 additions & 40 deletions

File tree

‎ietf/community/migrations/0001_initial.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
# Copyright The IETF Trust 2018-2019, All Rights Reserved
1+
# Copyright The IETF Trust 2018-2020, All Rights Reserved
22
# -*- coding: utf-8 -*-
33
# Generated by Django 1.11.10 on 2018-02-20 10:52
44
from __future__ import absolute_import, print_function, unicode_literals
55

6-
import six
7-
if six.PY3:
8-
from typing import List, Tuple # pyflakes:ignore
6+
from typing import List, Tuple # pyflakes:ignore
97

108
from django.db import migrations, models
119
import django.db.models.deletion

‎ietf/group/models.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
import jsonfield
88
import os
99
import re
10-
import six
1110

12-
from six.moves.urllib.parse import urljoin
11+
from urllib.parse import urljoin
1312

1413
from django.conf import settings
1514
from django.core.validators import RegexValidator
@@ -97,7 +96,7 @@ def latest_event(self, *args, **filter_args):
9796
return e[0] if e else None
9897

9998
def has_role(self, user, role_names):
100-
if isinstance(role_names, six.string_types):
99+
if isinstance(role_names, str):
101100
role_names = [role_names]
102101
return user.is_authenticated and self.role_set.filter(name__in=role_names, person__user=user).exists()
103102

‎ietf/ietfauth/tests.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Copyright The IETF Trust 2009-2019, All Rights Reserved
1+
# Copyright The IETF Trust 2009-2020, All Rights Reserved
22
# -*- coding: utf-8 -*-
33

44

55
from __future__ import absolute_import, print_function, unicode_literals
66

77
import io
88
import os, shutil, time, datetime
9-
from six.moves.urllib.parse import urlsplit
9+
from urllib.parse import urlsplit
1010
from pyquery import PyQuery
1111
from unittest import skipIf
1212

‎ietf/mailtrigger/forms.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
# Copyright The IETF Trust 2015-2019, All Rights Reserved
1+
# Copyright The IETF Trust 2015-2020, All Rights Reserved
22
# -*- coding: utf-8 -*-
33
from __future__ import absolute_import, print_function, unicode_literals
44

5-
import six
6-
if six.PY3:
7-
from typing import Dict, List # pyflakes:ignore
5+
6+
from typing import Dict, List # pyflakes:ignore
87

98
from django import forms
109

‎ietf/mailtrigger/migrations/0001_initial.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
# Copyright The IETF Trust 2018-2019, All Rights Reserved
1+
# Copyright The IETF Trust 2018-2020, All Rights Reserved
22
# -*- coding: utf-8 -*-
33
# Generated by Django 1.11.10 on 2018-02-20 10:52
44

55

66
from __future__ import absolute_import, print_function, unicode_literals
77

8-
import six
9-
if six.PY3:
10-
from typing import List, Tuple # pyflakes:ignore
8+
from typing import List, Tuple # pyflakes:ignore
119

1210
from django.db import migrations, models
1311

‎ietf/mailtrigger/test_utils.py‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright The IETF Trust 2015-2019, All Rights Reserved
1+
# Copyright The IETF Trust 2015-2020, All Rights Reserved
22
# -*- coding: utf-8 -*-
33

44

@@ -8,7 +8,6 @@
88
from ietf.mailtrigger.models import MailTrigger
99
from .utils import gather_address_lists
1010
from ietf.utils.test_utils import TestCase
11-
import six
1211

1312

1413
class GatherAddressListsTests(TestCase):
@@ -19,15 +18,15 @@ def setUp(self):
1918
def test_regular_trigger(self):
2019
to, cc = gather_address_lists('doc_pulled_from_rfc_queue', doc=self.doc)
2120
# Despite its name, assertCountEqual also compares content, but does not care for ordering
22-
six.assertCountEqual(self, to, ['iana@iana.org', 'rfc-editor@rfc-editor.org'])
23-
six.assertCountEqual(self, cc, ['The IESG <iesg@ietf.org>', self.author_address,
21+
self.assertCountEqual(to, ['iana@iana.org', 'rfc-editor@rfc-editor.org'])
22+
self.assertCountEqual(cc, ['The IESG <iesg@ietf.org>', self.author_address,
2423
'mars-chairs@ietf.org', 'iesg-secretary@ietf.org'])
2524

2625
def test_skipped_recipient(self):
2726
to, cc = gather_address_lists('doc_pulled_from_rfc_queue', doc=self.doc,
2827
skipped_recipients=['mars-chairs@ietf.org', 'iana@iana.org'])
29-
six.assertCountEqual(self, to, ['rfc-editor@rfc-editor.org'])
30-
six.assertCountEqual(self, cc, ['The IESG <iesg@ietf.org>', self.author_address,
28+
self.assertCountEqual(to, ['rfc-editor@rfc-editor.org'])
29+
self.assertCountEqual(cc, ['The IESG <iesg@ietf.org>', self.author_address,
3130
'iesg-secretary@ietf.org'])
3231

3332
def test_trigger_does_not_exist(self):
@@ -39,8 +38,8 @@ def test_create_if_not_exists(self):
3938
new_desc = 'Autocreated mailtrigger from doc_pulled_from_rfc_queue'
4039
to, cc = gather_address_lists(new_slug, doc=self.doc, desc_if_not_exists=new_desc,
4140
create_from_slug_if_not_exists='doc_pulled_from_rfc_queue')
42-
six.assertCountEqual(self, to, ['iana@iana.org', 'rfc-editor@rfc-editor.org'])
43-
six.assertCountEqual(self, cc, ['The IESG <iesg@ietf.org>', self.author_address,
41+
self.assertCountEqual(to, ['iana@iana.org', 'rfc-editor@rfc-editor.org'])
42+
self.assertCountEqual(cc, ['The IESG <iesg@ietf.org>', self.author_address,
4443
'mars-chairs@ietf.org', 'iesg-secretary@ietf.org'])
4544
new_trigger = MailTrigger.objects.get(slug=new_slug)
4645
self.assertEqual(new_trigger.desc, new_desc)

‎ietf/meeting/tests_api.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Copyright The IETF Trust 2013-2019, All Rights Reserved
1+
# Copyright The IETF Trust 2013-2020, All Rights Reserved
22
# -*- coding: utf-8 -*-
33

44

55
from __future__ import absolute_import, print_function, unicode_literals
66

77
import datetime
88

9-
from six.moves.urllib.parse import urlsplit
9+
from urllib.parse import urlsplit
1010

1111
from django.urls import reverse as urlreverse
1212

‎ietf/meeting/tests_views.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@
1010
import random
1111
import re
1212
import shutil
13-
import six
1413

1514
from unittest import skipIf
1615
from mock import patch
1716
from pyquery import PyQuery
1817
from io import StringIO, BytesIO
1918
from bs4 import BeautifulSoup
20-
from six.moves.urllib.parse import urlparse
19+
from urllib.parse import urlparse
2120

2221
from django.urls import reverse as urlreverse
2322
from django.conf import settings
@@ -438,7 +437,7 @@ def test_proceedings_acknowledgements(self):
438437

439438
@patch('urllib.request.urlopen')
440439
def test_proceedings_attendees(self, mock_urlopen):
441-
mock_urlopen.return_value = six.BytesIO(b'[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
440+
mock_urlopen.return_value = BytesIO(b'[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
442441
make_meeting_test_data()
443442
meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="96")
444443
finalize(meeting)
@@ -453,7 +452,7 @@ def test_proceedings_overview(self, mock_urlopen):
453452
'''Test proceedings IETF Overview page.
454453
Note: old meetings aren't supported so need to add a new meeting then test.
455454
'''
456-
mock_urlopen.return_value = six.BytesIO(b'[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
455+
mock_urlopen.return_value = BytesIO(b'[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
457456
make_meeting_test_data()
458457
meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="96")
459458
finalize(meeting)

‎ietf/meeting/utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import json
99
import urllib.request
1010

11-
from six.moves.urllib.error import HTTPError
11+
from urllib.error import HTTPError
1212
from django.conf import settings
1313
from django.template.loader import render_to_string
1414
from django.db.models.expressions import Subquery, OuterRef

‎ietf/nomcom/forms.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44

55
from __future__ import absolute_import, print_function, unicode_literals
66

7-
import six
8-
if six.PY3:
9-
from typing import List, Tuple # pyflakes:ignore
7+
from typing import List, Tuple # pyflakes:ignore
108

119
from django.conf import settings
1210
from django import forms

0 commit comments

Comments
 (0)