Remove six dependency.

kotti/message.py

@@ -1,10 +1,10 @@
+import hashlib
 import time
 from typing import Dict
 from typing import List
 from typing import Optional
 from urllib.parse import urlencode
 
-import hashlib
 from html2text import HTML2Text
 from pyramid.renderers import render
 from pyramid_mailer.mailer import Mailer

kotti/migrate.py

@@ -39,6 +39,8 @@ def kotti_configure(settings):
 'stamp_heads' will then include the add-on.
 """
 import os
+from typing import Callable
+from typing import List
 
 import pkg_resources
 from alembic.config import Config
@@ -52,8 +54,6 @@ def kotti_configure(settings):
 from kotti import get_settings
 from kotti.util import command
 
-from typing import Callable, List
-
 KOTTI_SCRIPT_DIR = pkg_resources.resource_filename("kotti", "alembic")
 DEFAULT_LOCATION = "kotti:alembic"
 

kotti/populate.py

@@ -5,7 +5,6 @@
 
 from pyramid.i18n import LocalizerRequestMixin
 from pyramid.threadlocal import get_current_registry
-from six import iteritems
 
 from kotti import get_settings
 from kotti.resources import DBSession

kotti/resources.py

@@ -7,25 +7,25 @@
 
 .. inheritance-diagram:: kotti.resources
 """
+import abc
 import datetime
+import os
+import warnings
 from cgi import FieldStorage
 from collections.abc import MutableMapping
+from copy import copy
+from fnmatch import fnmatch
+from io import BufferedReader
+from io import BytesIO
 from typing import Any
 from typing import Iterable
 from typing import List
 from typing import Optional
 from typing import Union
 
-import abc
-import os
-import warnings
-from copy import copy
 from depot.fields.sqlalchemy import UploadedFileField
 from depot.fields.sqlalchemy import _SQLAMutationTracker
 from depot.fields.upload import UploadedFile
-from fnmatch import fnmatch
-from io import BufferedReader
-from io import BytesIO
 from pyramid.decorator import reify
 from pyramid.traversal import resource_path
 from sqlalchemy import Boolean

kotti/sanitizers.py

@@ -13,7 +13,6 @@
 from bleach_whitelist.bleach_whitelist import print_tags
 from pyramid.config import Configurator
 from pyramid.util import DottedNameResolver
-from six import string_types
 
 from kotti import get_settings
 from kotti.events import ObjectInsert

kotti/security.py

@@ -14,7 +14,6 @@
 from pyramid.location import lineage
 from pyramid.security import PermitsResult
 from pyramid.security import view_execution_permitted
-from six import string_types
 from sqlalchemy import Boolean
 from sqlalchemy import Column
 from sqlalchemy import DateTime

kotti/views/users.py

@@ -9,10 +9,10 @@
 from deform.widget import CheckedPasswordWidget
 from deform.widget import SequenceWidget
 from pyramid.exceptions import Forbidden
-from pyramid.httpexceptions import HTTPFound, HTTPBadRequest
+from pyramid.httpexceptions import HTTPBadRequest
+from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
 from pyramid_deform import FormView
-from six import string_types
 
 from kotti.events import UserDeleted
 from kotti.events import notify

kotti/views/util.py

@@ -23,8 +23,9 @@
 from kotti import get_settings
 from kotti.events import objectevent_listeners
 from kotti.interfaces import INavigationRoot
-from kotti.resources import Content, Node
+from kotti.resources import Content
 from kotti.resources import Document
+from kotti.resources import Node
 from kotti.resources import Tag
 from kotti.resources import TagsToContents
 from kotti.resources import get_root