Merge branch 'fix-docs-build'

sphinxtools/constants.py

@@ -81,6 +81,7 @@ MODULENAME_REPLACE = {'_core'    : '',
                       '_grid'    : 'grid.',
                       '_richtext': 'richtext.',
                       '_webkit'  : 'webkit.',
+                      '_media'   : 'media.',
                       }
 
 NO_MODULE = {

sphinxtools/librarydescription.py

@@ -19,8 +19,9 @@ from . import templates
 
 EPYDOC_PATTERN = re.compile(r'\S+{\S+}', re.DOTALL)
 
-reload(sys)
-sys.setdefaultencoding('utf-8')
+if sys.version_info < (3,):
+    reload(sys)
+    sys.setdefaultencoding('utf-8')
 
 
 def make_class_tree(tree):

sphinxtools/modulehunter.py

@@ -12,7 +12,6 @@ import imp
 import traceback
 import pkgutil
 
-import __builtin__
 
 if sys.version_info < (3,):
     import cPickle as pickle
@@ -34,8 +33,9 @@ from .utilities import IsPython3
 from .constants import object_types, EXCLUDED_ATTRS, MODULE_TO_ICON
 from .constants import CONSTANT_RE
 
-reload(sys)
-sys.setdefaultencoding('utf-8')
+if sys.version_info < (3,):
+    reload(sys)
+    sys.setdefaultencoding('utf-8')
 
 try:
     import wx
@@ -680,4 +680,4 @@ if __name__ == '__main__':
 
     
     
-    
+