IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge with 0.6

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sphinx/builders/__init__.py
View File

@ -16,7 +16,7 @@ from os import path
from docutils import nodes from docutils import nodes
from sphinx import package_dir, locale 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.environment import BuildEnvironment
from sphinx.util.console import bold, purple, darkgreen, term_width_line 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)) path.join(self.doctreedir, ENV_PICKLE_FILENAME))
self.info('done') self.info('done')
except Exception, err: 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') self.info('not found')
else: else:
self.info('failed: %s' % err) self.info('failed: %s' % err)

7
sphinx/writers/html.py
View File

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