From: Mike Bayer Date: Sun, 10 Nov 2013 07:52:27 +0000 (-0500) Subject: - some py3k compatibility X-Git-Tag: rel_0_9_0~129 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=409cdafe458e632a1273cbd0f9aa1b25dc25e3c2;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - some py3k compatibility --- diff --git a/doc/build/builder/viewsource.py b/doc/build/builder/viewsource.py index 399908504b..3f6b8263a8 100644 --- a/doc/build/builder/viewsource.py +++ b/doc/build/builder/viewsource.py @@ -9,6 +9,14 @@ import os from docutils.statemachine import StringList from sphinx.environment import NoUri +import sys + +py2k = sys.version_info < (3, 0) +if py2k: + text_type = unicode +else: + text_type = str + def view_source(name, rawtext, text, lineno, inliner, options={}, content=[]): @@ -56,7 +64,7 @@ def _view_source_node(env, text, state): analyzer = ModuleAnalyzer.for_file(pathname, modname) # copied from viewcode analyzer.find_tags() - if not isinstance(analyzer.code, unicode): + if not isinstance(analyzer.code, text_type): code = analyzer.code.decode(analyzer.encoding) else: code = analyzer.code