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

* Define __file__ during conf.py execution.

Browse Source 
* Make staticpath relative to conf.py dir.
This commit is contained in:
Georg Brandl 2008-03-16 20:52:34 +00:00
parent 2f37a14939
commit ae7273b9ae
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/conf.py
View File

@ -11,10 +11,10 @@
# All configuration values have a default value; values that are commented out # All configuration values have a default value; values that are commented out
# serve to show the default value. # serve to show the default value.
import sys import sys, os
# If your extensions are in another directory, add it here. # If your extensions are in another directory, add it here.
sys.path.append('.') sys.path.append(os.path.dirname(__file__))
# General configuration # General configuration
# --------------------- # ---------------------

3
sphinx/builder.py
View File

@ -448,7 +448,8 @@ class StandaloneHTMLBuilder(Builder):
self.info(bold('copying static files...')) self.info(bold('copying static files...'))
ensuredir(path.join(self.outdir, 'static')) ensuredir(path.join(self.outdir, 'static'))
staticdirnames = [path.join(path.dirname(__file__), 'static')] + \ staticdirnames = [path.join(path.dirname(__file__), 'static')] + \
self.config.html_static_path [path.join(self.srcdir, spath)
for spath in self.config.html_static_path]
for staticdirname in staticdirnames: for staticdirname in staticdirnames:
for filename in os.listdir(staticdirname): for filename in os.listdir(staticdirname):
if not filename.startswith('.'): if not filename.startswith('.'):

4
sphinx/config.py
View File

@ -68,11 +68,11 @@ class Config(object):
def __init__(self, dirname, filename): def __init__(self, dirname, filename):
self.values = self.config_values.copy() self.values = self.config_values.copy()
config = {} config = {'__file__': path.join(dirname, filename)}
olddir = os.getcwd() olddir = os.getcwd()
try: try:
os.chdir(dirname) os.chdir(dirname)
execfile(path.join(dirname, filename), config) execfile(config['__file__'], config)
finally: finally:
os.chdir(olddir) os.chdir(olddir)
# remove potentially pickling-problematic values # remove potentially pickling-problematic values