Import only string_types from six

wiki/core/plugins/registry.py

 # -*- coding: utf-8 -*-
 from django.utils.importlib import import_module
+from six import string_types
 
 _cache = {}
 _settings_forms = []
@@ -19,7 +20,7 @@ def register(PluginClass):
     
     settings_form = getattr(PluginClass, 'settings_form', None)
     if settings_form:
-        if isinstance(settings_form, six.string_types):
+        if isinstance(settings_form, string_types):
             klassname = settings_form.split(".")[-1]
             modulename = ".".join(settings_form.split(".")[:-1])
             form_module = import_module(modulename)

wiki/models/__init__.py

@@ -3,6 +3,7 @@
 from django.conf import settings as django_settings
 from django.core.exceptions import ImproperlyConfigured
 import warnings
+from six import string_types
 
 # TODO: Don't use wildcards
 from .article import *
@@ -58,7 +59,7 @@ def reverse(*args, **kwargs):
     return the result of calling reverse._transform_url(reversed_url)
     for every url in the wiki namespace.
     """
-    if isinstance(args[0], six.string_types) and args[0].startswith('wiki:'):
+    if isinstance(args[0], string_types) and args[0].startswith('wiki:'):
         url_kwargs = kwargs.get('kwargs', {})
         path = url_kwargs.get('path', False)
         # If a path is supplied then discard the article_id

wiki/plugins/macros/mdx/macro.py

 # -*- coding: utf-8 -*-
 import markdown
 import re
+from six import string_types
 
 from django.utils.translation import ugettext as _
 from django.template.loader import render_to_string
@@ -44,7 +45,7 @@ class MacroPreprocessor(markdown.preprocessors.Preprocessor):
                             value = kwarg.group('value')
                             if value is None:
                                 value = True
-                            if isinstance(value, six.string_types):
+                            if isinstance(value, string_types):
                                 # If value is enclosed with ': Remove and remove escape sequences
                                 if value.startswith(u"'") and len(value) > 2:
                                     value = value[1:-1]