Add Python 3.2 support

3 files changed, 7 insertions, 2 deletions

diff --git a/.travis.yml b/.travis.yml
index 4b50094..917e240 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: python
 python:
   - "2.6"
   - "2.7"
+  - "3.2"
   - "3.3"
   - "pypy"
 install:
diff --git a/mammoth/html_generation.py b/mammoth/html_generation.py
index f6f62af..8395a3d 100644
--- a/mammoth/html_generation.py
+++ b/mammoth/html_generation.py
@@ -45,7 +45,7 @@ class HtmlGenerator(object):
                 self._fragments.append(fragment)
     
     def html_string(self):
-        return u"".join(self._fragments)
+        return u("").join(self._fragments)
 
 
 class _Element(object):
@@ -106,5 +106,9 @@ def _generate_class_attribute(path_element):
 
 if sys.version_info[0] == 2:
     _iteritems = lambda x: x.iteritems()
+    u = lambda value: unicode(value, "unicode_escape")
+    
 else:
     _iteritems = lambda x: x.items()
+    u = lambda value: value
+
diff --git a/tox.ini b/tox.ini
index 53c7b68..dc9d543 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py33,pypy
+envlist = py26,py27,py32,py33,pypy
 [testenv]
 changedir = {envtmpdir}
 deps=-r{toxinidir}/test-requirements.txt