Python 3.6 support

.travis.yml

@@ -1,6 +1,8 @@
 language: python
 python:
   - 2.7
+  - 3.5
+  - 3.6
 install:
   - make
 script:

README.rst

@@ -114,7 +114,6 @@ TODO
 
 .. _todo_section:
 
-- [ ] Python 3 support ... ;)
 - [ ] Valueless attributes are not allowed in XML
 - [ ] Attributes are aligned in a strange way if previous sibling has no spaces
 - [ ] TBD: Style attributes should be multiline

setup.py

@@ -32,7 +32,7 @@ def read(*rnames):
         'Intended Audience :: Developers',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 2 :: Only',
+        'Programming Language :: Python :: 3.6',
     ],
     author='Alessandro Pisa',
     author_email='alessandro.pisa@gmail.com',
@@ -41,6 +41,7 @@ def read(*rnames):
     packages=find_packages(),
     install_requires=[
         'setuptools',
+        'six',
         'beautifulsoup4',
         'lxml',
     ],

zpretty/elements.py

@@ -12,6 +12,8 @@
 from zpretty.text import rstrip_last_line
 from zpretty.text import startswith_whitespace
 
+import six
+
 
 class OpenTagException(Exception):
     ''' We want this element to be closed
@@ -212,7 +214,7 @@ def text(self):
         if not isinstance(self.context, NavigableString):
             return u''
         if self.is_comment():
-            return unicode(self.context)
+            return six.text_type(self.context)
         return self.escaper.substitute_html(self.context.string)
 
     @property

zpretty/prettifier.py

@@ -5,6 +5,7 @@
 from zpretty.elements import PrettyElement
 
 import fileinput
+import six
 
 
 logger = getLogger(__name__)
@@ -18,7 +19,7 @@ class ZPrettifier(object):
     parser = 'html.parser'
     builder = None
     _end_with_newline = True
-    _newlines_marker = unicode(uuid4())
+    _newlines_marker = six.text_type(uuid4())
 
     def __init__(
         self,
@@ -33,7 +34,7 @@ def __init__(
         self.filename = filename
         if self.filename:
             text = ''.join(fileinput.input([filename]))
-        if not isinstance(text, unicode):
+        if not isinstance(text, six.text_type):
             text = text.decode(self.encoding)
         self.text = "\n".join(
             line if line.strip() else self._newlines_marker

zpretty/text.py

@@ -1,12 +1,13 @@
 # coding=utf-8
+import six
 
 
 def startswith_whitespace(text):
     ''' Check if text starts with a whitespace
 
     If text is not a string return False
     '''
-    if not isinstance(text, basestring):
+    if not isinstance(text, six.string_types):
         return False
     return text[:1].isspace()
 
@@ -16,7 +17,7 @@ def endswith_whitespace(text):
 
     If text is not a string return False
     '''
-    if not isinstance(text, basestring):
+    if not isinstance(text, six.string_types):
         return False
     return text[-1:].isspace()