Drop dependency on 'six'.

CHANGES.rst

@@ -4,6 +4,8 @@ Changes
 4.1.0 (unreleased)
 ------------------
 
+- Drop dependency on ``six``.
+
 - Add support for Python 3.4.
 
 - Add support for testing on Travis.

setup.py

@@ -58,7 +58,7 @@ def read(*rnames):
     packages=find_packages('src'),
     package_dir={'': 'src'},
     namespace_packages=['zope',],
-    install_requires=['setuptools', 'six'],
+    install_requires=['setuptools'],
     test_suite='zope.structuredtext.tests.test_suite',
     include_package_data=True,
     zip_safe=False,

src/zope/structuredtext/document.py

@@ -13,7 +13,6 @@
 """ Structured text document parser
 """
 import re
-import six
 
 from zope.structuredtext.stletters import letters
 from zope.structuredtext.stletters import literal_punc
@@ -41,6 +40,10 @@
 from zope.structuredtext.stng import StructuredTextXref
 from zope.structuredtext.stng import structurize
 
+try:
+    string_types = (unicode, str)
+except NameError:   # pragma: NO COVER Py3k
+    string_types = (str,)
 
 __metaclass__ = type
 
@@ -84,7 +87,7 @@ class Document:
         ]
 
     def __call__(self, doc):
-        if isinstance(doc, six.string_types):
+        if isinstance(doc, string_types):
             doc = structurize(doc)
             doc.setSubparagraphs(self.color_paragraphs(
                doc.getSubparagraphs()))
@@ -108,7 +111,7 @@ def parse(self, raw_string, text_type, type=type):
 
         tmp = []    # the list to be returned if raw_string is split
 
-        if isinstance(text_type, six.string_types):
+        if isinstance(text_type, string_types):
             text_type = getattr(self, text_type)
 
         while True:
@@ -121,7 +124,7 @@ def parse(self, raw_string, text_type, type=type):
             if start:
                 tmp.append(raw_string[:start])
 
-            if isinstance(t, six.string_types):
+            if isinstance(t, string_types):
                 # if we get a string back, add it to text to be parsed
                 raw_string = t + raw_string[end:len(raw_string)]
             else:
@@ -151,13 +154,13 @@ def color_text(self, text, types=None):
 
         for text_type in types:
 
-            if isinstance(text, six.string_types):
+            if isinstance(text, string_types):
                 text = self.parse(text, text_type)
             elif isinstance(text, list):  #Waaaa
                 result = []
 
                 for s in text:
-                    if isinstance(s, six.string_types):
+                    if isinstance(s, string_types):
                         s = self.parse(s, text_type)
                         if isinstance(s, list):
                             result.extend(s)
@@ -180,7 +183,7 @@ def color_text(self, text, types=None):
 
     def color_paragraphs(self, raw_paragraphs,
                            type=type, sequence_types=(tuple, list),
-                           sts=six.string_types):
+                           sts=string_types):
         result=[]
         for paragraph in raw_paragraphs:
             if paragraph.getNodeName() != 'StructuredTextParagraph':

src/zope/structuredtext/stdom.py

@@ -12,7 +12,10 @@
 ##############################################################################
 """DOM implementation in StructuredText: read-only methods
 """
-from six import string_types
+try:
+    string_types = (unicode, str)
+except NameError:   # pragma: NO COVER Py3k
+    string_types = (str,)
 
 __metaclass__ = type
 

src/zope/structuredtext/tests.py

@@ -1,6 +1,4 @@
 from __future__ import print_function
-from __future__ import print_function
-from __future__ import print_function
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Foundation and Contributors.
@@ -76,9 +74,9 @@ def _test(self, stxtxt, expected):
         doc = DocumentWithImages()(doc)
         output = HTMLWithImages()(doc, level=1)
         if not expected in output:
-            print("Text:     ", stxtxt.encode('utf-8'))
-            print("Converted:", output.encode('utf-8'))
-            print("Expected: ", expected.encode('utf-8'))
+            print("Text:      %s" % stxtxt.encode('utf-8'))
+            print("Converted: %s" % output.encode('utf-8'))
+            print("Expected:  %s" % expected.encode('utf-8'))
             self.fail("'%s' not in result" % expected)        
 
     def testUnderline(self):

tox.ini

@@ -1,9 +1,9 @@
 [tox]
 envlist =
+#   Pending normalization of HTML output for regressions.
+#   py26,py27,py33,py34,pypy,pypy3
     py26,py27,py33,py34
 
 [testenv]
 commands =
     python setup.py test -q
-deps =
-     six