Commits

Georg Brandl committed bbce72d Merge

merge with trunk

Comments (0)

Files changed (3)

sphinx/builders/__init__.py

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

sphinx/writers/html.py

 
     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

tests/root/includes.txt

 
 .. include:: quotes.inc
    :literal:
-   :tab-width: 4