FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix plot_basedir bug in sphinxext by jseabold · Pull Request #132 · matplotlib/matplotlib · GitHub

  1. matplotlib
  2. matplotlib

Repository navigation

Fix plot_basedir bug in sphinxext #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ddale merged 2 commits into from
Jun 16, 2011
Conversation 3 Commits 2 Checks 0 Files changed
Merged

Fix plot_basedir bug in sphinxext #132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41f46a9
Fix plot_basedir bug in sphinxext
jseabold Jun 2, 2011
c0532eb
Removed commented code
jseabold Jun 15, 2011
File filter

Filter by extension

Filter by extension .py  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
18 changes: 12 additions & 6 deletions lib/matplotlib/sphinxext/plot_directive.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -657,14 +657,19 @@ def run(arguments, content, options, state_machine, state, lineno):
build_dir = os.path.join(os.path.dirname(setup.app.doctreedir),
'plot_directive',
source_rel_dir)
# get rid of .. in paths, also changes pathsep
# see note in Python docs for warning about symbolic links on Windows.
# need to compare source and dest paths at end
build_dir = os.path.normpath(build_dir)

if not os.path.exists(build_dir):
cbook.mkdirs(build_dir)
os.makedirs(build_dir)

# output_dir: final location in the builder's directory
dest_dir = os.path.abspath(os.path.join(setup.app.builder.outdir,
source_rel_dir))
if not os.path.exists(dest_dir):
cbook.mkdirs(dest_dir)
os.makedirs(dest_dir) # no problem here for me, but just use built-ins

# how to link to files from the RST file
dest_dir_link = os.path.join(relpath(setup.confdir, rst_dir),
Expand Down Expand Up @@ -738,15 +743,16 @@ def run(arguments, content, options, state_machine, state, lineno):
if total_lines:
state_machine.insert_input(total_lines, source=source_file_name)

# copy image files to builder's output directory
# copy image files to builder's output directory, if necessary
if not os.path.exists(dest_dir):
cbook.mkdirs(dest_dir)

for code_piece, images in results:
for img in images:
for fn in img.filenames():
shutil.copyfile(fn, os.path.join(dest_dir,
os.path.basename(fn)))
destimg = os.path.join(dest_dir, os.path.basename(fn))
if fn != destimg:
shutil.copyfile(fn, destimg)

# copy script (if necessary)
if source_file_name == rst_file:
Expand Down
Back | FazBrowse Home | New Git URL