diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py index 9ca35cc38..99927eb82 100644 --- a/sphinx/builders/__init__.py +++ b/sphinx/builders/__init__.py @@ -16,7 +16,7 @@ from os import path from docutils import nodes from sphinx import package_dir, locale -from sphinx.util import SEP, EEXIST, relative_uri +from sphinx.util import SEP, ENOENT, relative_uri from sphinx.environment import BuildEnvironment from sphinx.util.console import bold, purple, darkgreen, term_width_line @@ -210,7 +210,7 @@ class Builder(object): path.join(self.doctreedir, ENV_PICKLE_FILENAME)) self.info('done') except Exception, err: - if type(err) is IOError and err.errno == EEXIST: + if type(err) is IOError and err.errno == ENOENT: self.info('not found') else: self.info('failed: %s' % err) diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py index 95c389c71..c561acf4f 100644 --- a/sphinx/writers/html.py +++ b/sphinx/writers/html.py @@ -503,9 +503,10 @@ class SmartyPantsHTMLTranslator(HTMLTranslator): def visit_literal_block(self, node): self.no_smarty += 1 - - def depart_literal_block(self, node): - self.no_smarty -= 1 + try: + HTMLTranslator.visit_literal_block(self, node) + finally: + self.no_smarty -= 1 def visit_literal_emphasis(self, node): self.no_smarty += 1