diff options
author | Georg Brandl <georg@python.org> | 2012-03-10 21:50:06 +0100 |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2012-03-10 21:50:06 +0100 |
commit | 9bff8f206c178d973457adcb16ac9c55973257c0 (patch) | |
tree | 83314b920e475b8ee70a8215698b7c94ce6ce709 /sphinx/util/__init__.py | |
parent | 0adcbc43afa3e23a49be91e1da8dd56f72bbf53b (diff) | |
download | sphinx-git-1.1.tar.gz |
Diffstat (limited to 'sphinx/util/__init__.py')
-rw-r--r-- | sphinx/util/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sphinx/util/__init__.py b/sphinx/util/__init__.py index 0d67da82c..6cb83aec2 100644 --- a/sphinx/util/__init__.py +++ b/sphinx/util/__init__.py @@ -28,6 +28,7 @@ import jinja2 import sphinx from sphinx.errors import PycodeError +from sphinx.util.pycompat import bytes # import other utilities; partly for backwards compatibility, so don't # prune unused ones indiscriminately @@ -310,7 +311,7 @@ def parselinenos(spec, total): def force_decode(string, encoding): """Forcibly get a unicode string out of a bytestring.""" - if isinstance(string, str): + if isinstance(string, bytes): if encoding: string = string.decode(encoding) else: |