Merged in shimizukawa/sphinx-use-six (pull request #238)

using six package for py2/3 compatibility without 2to3. refs #1350

3 files changed, 7 insertions, 4 deletions

diff --git a/sphinx/websupport/__init__.py b/sphinx/websupport/__init__.py
index 0e9131d0e..4cdedc0dd 100644
--- a/sphinx/websupport/__init__.py
+++ b/sphinx/websupport/__init__.py
@@ -10,12 +10,11 @@
 """
 
 import sys
-import cPickle as pickle
 import posixpath
 from os import path
 
+from six.moves import cPickle as pickle
 from jinja2 import Environment, FileSystemLoader
-
 from docutils.core import publish_parts
 
 from sphinx.application import Sphinx
diff --git a/sphinx/websupport/search/__init__.py b/sphinx/websupport/search/__init__.py
index 45068d29b..f2a67b4d4 100644
--- a/sphinx/websupport/search/__init__.py
+++ b/sphinx/websupport/search/__init__.py
@@ -11,6 +11,8 @@
 
 import re
 
+from six import text_type
+
 
 class BaseSearch(object):
     def __init__(self, path):
@@ -109,7 +111,7 @@ class BaseSearch(object):
                            context_end < len(text) and '...' or ''])
 
         try:
-            return unicode(context, errors='ignore')
+            return text_type(context, errors='ignore')
         except TypeError:
             return context
 
diff --git a/sphinx/websupport/search/whooshsearch.py b/sphinx/websupport/search/whooshsearch.py
index 6d1f9de4a..17adf0584 100644
--- a/sphinx/websupport/search/whooshsearch.py
+++ b/sphinx/websupport/search/whooshsearch.py
@@ -14,6 +14,8 @@ from whoosh.fields import Schema, ID, TEXT
 from whoosh.qparser import QueryParser
 from whoosh.analysis import StemmingAnalyzer
 
+from six import text_type
+
 from sphinx.util.osutil import ensuredir
 from sphinx.websupport.search import BaseSearch
 
@@ -43,7 +45,7 @@ class WhooshSearch(BaseSearch):
         self.index_writer.commit()
 
     def add_document(self, pagename, title, text):
-        self.index_writer.add_document(path=unicode(pagename),
+        self.index_writer.add_document(path=text_type(pagename),
                                        title=title,
                                        text=text)