From 198013be9337df1411f85cf6809e5f9817b5b5b4 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Mon, 28 Dec 2009 19:03:36 +0100 Subject: [PATCH 1/2] Fix bug replacing 2 by its errno constant. --- sphinx/builders/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py index ebabe0e0e..54d62a2c3 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) From 654bc580d0d2c224289afd2c09744fabd67e01e9 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Mon, 28 Dec 2009 19:39:15 +0100 Subject: [PATCH 2/2] Fix for commit 41cb9d297064. --- sphinx/writers/html.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py index eab7ce464..784234768 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