From a700ef0cae19d7d212604f06da2919f057363012 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sun, 28 Feb 2016 20:52:59 -0800 Subject: [PATCH] Don't use reload on Python3 --- sphinxtools/librarydescription.py | 5 +++-- sphinxtools/modulehunter.py | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sphinxtools/librarydescription.py b/sphinxtools/librarydescription.py index 0136e9a2..f43d99f3 100644 --- a/sphinxtools/librarydescription.py +++ b/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): diff --git a/sphinxtools/modulehunter.py b/sphinxtools/modulehunter.py index 643dae20..56f63f6c 100644 --- a/sphinxtools/modulehunter.py +++ b/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__': - \ No newline at end of file +