misc: remove usage of six (#36331)

chrono/manager/forms.py

@@ -22,7 +22,6 @@ import datetime
 from django import forms
 from django.contrib.auth.models import Group
 from django.forms import ValidationError
-from django.utils import six
 from django.utils.encoding import force_text
 from django.utils.timezone import make_aware
 from django.utils.translation import ugettext_lazy as _
@@ -193,19 +192,12 @@ class ImportEventsForm(forms.Form):
         # this line with content being a unicode string.
 
         try:
-            dialect = csv.Sniffer().sniff(content if six.PY3 else content.encode('utf-8'))
+            dialect = csv.Sniffer().sniff(content)
         except csv.Error:
             dialect = None
 
-        if six.PY3:
-            utf_8_encoder = lambda x: x
-        else:
-            def utf_8_encoder(unicode_csv_data):
-                for line in unicode_csv_data:
-                    yield line.encode('utf-8')
-
         events = []
-        for i, csvline in enumerate(csv.reader(utf_8_encoder(content.splitlines()), dialect=dialect)):
+        for i, csvline in enumerate(csv.reader(content.splitlines(), dialect=dialect)):
             if not csvline:
                 continue
             if len(csvline) < 3:

chrono/views.py

@@ -14,12 +14,13 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from urllib.parse import quote
+
 from django.conf import settings
 from django.contrib.auth import views as auth_views
 from django.http import HttpResponseRedirect
 from django.shortcuts import resolve_url
 from django.utils.decorators import method_decorator
-from django.utils.six.moves.urllib.parse import quote
 from django.views.decorators.cache import never_cache
 
 

tests/test_api.py

@@ -1,4 +1,5 @@
 import datetime
+import urllib.parse as urlparse
 import pytest
 import sys
 
@@ -6,7 +7,6 @@ from django.contrib.auth import get_user_model
 from django.db import connection
 from django.test import override_settings
 from django.test.utils import CaptureQueriesContext
-from django.utils.six.moves.urllib import parse as urlparse
 from django.utils.timezone import now, make_aware, localtime
 
 from chrono.agendas.models import (Agenda, Event, Booking,

tests/test_import_export.py

@@ -3,6 +3,7 @@
 from __future__ import unicode_literals
 
 import datetime
+from io import StringIO
 import json
 import os
 import shutil
@@ -13,7 +14,6 @@ import pytest
 from django.contrib.auth.models import Group
 from django.core.management import call_command, CommandError
 from django.utils.encoding import force_bytes
-from django.utils.six import StringIO
 from django.utils.timezone import make_aware
 
 from chrono.agendas.models import (Agenda, Event, TimePeriod, Desk,