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.5

Browse Source
This commit is contained in:
Georg Brandl 2009-01-13 23:59:01 +01:00
commit 88639dc45e
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sphinx/builders/html.py
View File

@ -22,7 +22,8 @@ from docutils.frontend import OptionParser
from docutils.readers.doctree import Reader as DoctreeReader from docutils.readers.doctree import Reader as DoctreeReader
from sphinx import package_dir, __version__ from sphinx import package_dir, __version__
from sphinx.util import SEP, os_path, relative_uri, ensuredir, ustrftime from sphinx.util import SEP, os_path, relative_uri, ensuredir, \
movefile, ustrftime
from sphinx.search import js_index from sphinx.search import js_index
from sphinx.builders import Builder, ENV_PICKLE_FILENAME from sphinx.builders import Builder, ENV_PICKLE_FILENAME
from sphinx.highlighting import PygmentsBridge from sphinx.highlighting import PygmentsBridge
@ -504,7 +505,7 @@ class StandaloneHTMLBuilder(Builder):
self.indexer.dump(f, self.indexer_format) self.indexer.dump(f, self.indexer_format)
finally: finally:
f.close() f.close()
os.rename(searchindexfn + '.tmp', searchindexfn) movefile(searchindexfn + '.tmp', searchindexfn)
self.info('done') self.info('done')
self.info(bold('dumping object inventory... '), nonl=True) self.info(bold('dumping object inventory... '), nonl=True)

6
sphinx/environment.py
View File

@ -43,8 +43,8 @@ from docutils.transforms import Transform
from docutils.transforms.parts import ContentsFilter from docutils.transforms.parts import ContentsFilter
from sphinx import addnodes from sphinx import addnodes
from sphinx.util import get_matching_docs, SEP, ustrftime, docname_join, \ from sphinx.util import movefile, get_matching_docs, SEP, ustrftime, \
FilenameUniqDict docname_join, FilenameUniqDict
from sphinx.directives import additional_xref_types from sphinx.directives import additional_xref_types
default_settings = { default_settings = {
@ -219,7 +219,7 @@ class BuildEnvironment:
pickle.dump(self, picklefile, pickle.HIGHEST_PROTOCOL) pickle.dump(self, picklefile, pickle.HIGHEST_PROTOCOL)
finally: finally:
picklefile.close() picklefile.close()
os.rename(filename + '.tmp', filename) movefile(filename + '.tmp', filename)
# reset attributes # reset attributes
self.config.values = values self.config.values = values
self.set_warnfunc(warnfunc) self.set_warnfunc(warnfunc)

2
sphinx/ext/intersphinx.py
View File

@ -125,7 +125,7 @@ def missing_reference(app, env, node, contnode):
if target not in env.intersphinx_inventory: if target not in env.intersphinx_inventory:
return None return None
type, proj, version, uri = env.intersphinx_inventory[target] type, proj, version, uri = env.intersphinx_inventory[target]
print "Intersphinx hit:", target, uri # print "Intersphinx hit:", target, uri
newnode = nodes.reference('', '') newnode = nodes.reference('', '')
newnode['refuri'] = uri + '#' + target newnode['refuri'] = uri + '#' + target
newnode['reftitle'] = '(in %s v%s)' % (proj, version) newnode['reftitle'] = '(in %s v%s)' % (proj, version)

9
sphinx/util/__init__.py
View File

@ -361,3 +361,12 @@ def force_decode(string, encoding):
# last resort -- can't fail # last resort -- can't fail
string = string.decode('latin1') string = string.decode('latin1')
return string return string
def movefile(source, dest):
# move a file, removing the destination if it exists
if os.path.exists(dest):
os.unlink(dest)
except OSError:
pass
os.rename(source, dest)