merge with 0.6

This commit is contained in:
Georg Brandl 2009-12-28 19:40:29 +01:00
commit 7605e0a44d
2 changed files with 6 additions and 5 deletions

View File

@ -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)

View File

@ -503,8 +503,9 @@ class SmartyPantsHTMLTranslator(HTMLTranslator):
def visit_literal_block(self, node):
self.no_smarty += 1
def depart_literal_block(self, node):
try:
HTMLTranslator.visit_literal_block(self, node)
finally:
self.no_smarty -= 1
def visit_literal_emphasis(self, node):