diff options
| author | Georg Brandl <georg@python.org> | 2010-01-12 23:40:26 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-01-12 23:40:26 +0000 |
| commit | 8c19002e83deb58e22ee7b2898757c05032cd3df (patch) | |
| tree | 4e1aa5dafdd64786dac97619c0f4f83c46675a55 | |
| parent | 52c246e013366318c682d591d9978304bdf7ff4f (diff) | |
| parent | 3f0c78f1e7208b77e1c0cfa18ce2b0ed6f01005b (diff) | |
| download | sphinx-8c19002e83deb58e22ee7b2898757c05032cd3df.tar.gz | |
merge with 0.6
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | doc/_templates/index.html | 6 | ||||
| -rw-r--r-- | sphinx/builders/latex.py | 2 | ||||
| -rw-r--r-- | sphinx/config.py | 11 |
4 files changed, 13 insertions, 10 deletions
@@ -76,8 +76,8 @@ Release 1.0 (in development) * Added ``htmltitle`` block in layout template. -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/doc/_templates/index.html b/doc/_templates/index.html index 0f4d4c64..a68a6251 100644 --- a/doc/_templates/index.html +++ b/doc/_templates/index.html @@ -46,8 +46,10 @@ <p> The <a href="http://docs.python.org/dev/">Python documentation</a> and this page are different examples of Sphinx in use. - You can also download a <a href="http://sphinx.pocoo.org/sphinx.pdf">PDF version</a> - of the Sphinx documentation, generated from the LaTeX Sphinx produces. + You can also download PDF versions of the Sphinx documentation: + a <a href="http://sphinx.pocoo.org/sphinx.pdf">version</a> generated from + the LaTeX Sphinx produces, and a + <a href="http://sphinx.pocoo.org/sphinx-rst2pdf.pdf">version</a> generated by rst2pdf. </p> <p> For examples of how Sphinx source files look, use the “Show source” diff --git a/sphinx/builders/latex.py b/sphinx/builders/latex.py index eed4787d..751bf28c 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 bbc3297a..4c1e92e1 100644 --- a/sphinx/config.py +++ b/sphinx/config.py @@ -144,11 +144,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) |