diff options
| author | Robert Lehmann <mail@robertlehmann.de> | 2013-01-02 17:45:33 +0100 |
|---|---|---|
| committer | Robert Lehmann <mail@robertlehmann.de> | 2013-01-02 17:45:33 +0100 |
| commit | 0725cb608a9ca6de67d3e681acb51507c300936e (patch) | |
| tree | e34d12e2493e12a7c68e3b43040bb2c664e6e8d3 /sphinx/config.py | |
| parent | ebc953d15cf1ea583e1b79399fb074ad26f7c6ce (diff) | |
| parent | 151856819c212229f6f58a8a2cbf9223a4191f94 (diff) | |
| download | sphinx-git-0725cb608a9ca6de67d3e681acb51507c300936e.tar.gz | |
merge with birkenfeld/sphinx
Diffstat (limited to 'sphinx/config.py')
| -rw-r--r-- | sphinx/config.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/config.py b/sphinx/config.py index 3599ccfc1..1134eb866 100644 --- a/sphinx/config.py +++ b/sphinx/config.py @@ -5,7 +5,7 @@ Build configuration file handling. - :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. + :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ @@ -204,7 +204,7 @@ class Config(object): os.chdir(dirname) # get config source -- 'b' is a no-op under 2.x, while 'U' is # ignored under 3.x (but 3.x compile() accepts \r\n newlines) - f = open(config_file, 'rbU') + f = open(filename, 'rbU') try: source = f.read() finally: |