From 1b725c3acf24474b4b05daac88f45203eec578ad Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 12 Jan 2010 10:47:05 +0000 Subject: [PATCH 1/5] Fix typo. --- sphinx/ext/graphviz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sphinx/ext/graphviz.py b/sphinx/ext/graphviz.py index 993d48962..b7cf93d24 100644 --- a/sphinx/ext/graphviz.py +++ b/sphinx/ext/graphviz.py @@ -142,7 +142,7 @@ def render_dot(self, code, options, format, prefix='graphviz'): def render_dot_html(self, node, code, options, prefix='graphviz', imgcls=None, alt=None): try: - fname, outfn = render_dot(self, code, options, 'pnf', prefix) + fname, outfn = render_dot(self, code, options, 'png', prefix) except GraphvizError, exc: self.builder.warn('dot code %r: ' % code + str(exc)) raise nodes.SkipNode From c2379f7c2105d3ea1460e1c5214ae8b426bd83d9 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 12 Jan 2010 20:53:43 +0000 Subject: [PATCH 2/5] Remove Python 2.5ism and undefined local access. --- sphinx/builders/latex.py | 2 +- sphinx/config.py | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sphinx/builders/latex.py b/sphinx/builders/latex.py index eed4787d5..751bf28cd 100644 --- a/sphinx/builders/latex.py +++ b/sphinx/builders/latex.py @@ -107,7 +107,7 @@ class LaTeXBuilder(Builder): except UnicodeError: self.warn("a Unicode error occurred when writing the output. " "Please make sure all config values that contain " - "non-ASCII content are Unicode strings." % pagename) + "non-ASCII content are Unicode strings.") return self.info("done") diff --git a/sphinx/config.py b/sphinx/config.py index 990849c93..4cd514921 100644 --- a/sphinx/config.py +++ b/sphinx/config.py @@ -121,11 +121,12 @@ class Config(object): config['tags'] = tags olddir = os.getcwd() try: - os.chdir(dirname) - execfile(config['__file__'], config) - except SyntaxError, err: - raise ConfigError('There is a syntax error in your ' - 'configuration file: ' + str(err)) + try: + os.chdir(dirname) + execfile(config['__file__'], config) + except SyntaxError, err: + raise ConfigError('There is a syntax error in your ' + 'configuration file: ' + str(err)) finally: os.chdir(olddir) From 872062f93b6ba2adebe369e4f38e6b45c3979101 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 12 Jan 2010 20:55:59 +0000 Subject: [PATCH 3/5] Prepare for release 0.6.4. --- CHANGES | 4 ++-- sphinx/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 6bb149feb..5e8d41ea6 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,5 @@ -Release 0.6.4 (in development) -============================== +Release 0.6.4 (Jan 12, 2010) +============================ * Improve the handling of non-Unicode strings in the configuration. diff --git a/sphinx/__init__.py b/sphinx/__init__.py index bbf83e58a..6a55c9b85 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -12,8 +12,8 @@ import sys from os import path -__version__ = '0.6.3+' -__released__ = '0.6.3' # used when Sphinx builds its own docs +__version__ = '0.6.4' +__released__ = '0.6.4' # used when Sphinx builds its own docs package_dir = path.abspath(path.dirname(__file__)) From fa00d30daf77fe195d2d6fd7902f06b124646af4 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 12 Jan 2010 21:11:20 +0000 Subject: [PATCH 5/5] Add link to rst2pdf generated version. --- doc/_templates/index.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/_templates/index.html b/doc/_templates/index.html index 0f4d4c641..a68a62514 100644 --- a/doc/_templates/index.html +++ b/doc/_templates/index.html @@ -46,8 +46,10 @@

The Python documentation and this page are different examples of Sphinx in use. - You can also download a PDF version - of the Sphinx documentation, generated from the LaTeX Sphinx produces. + You can also download PDF versions of the Sphinx documentation: + a version generated from + the LaTeX Sphinx produces, and a + version generated by rst2pdf.

For examples of how Sphinx source files look, use the “Show source”