Skip to content

No longer concatenating extensions #2268

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

Closed
wants to merge 2 commits into from
Closed

No longer concatenating extensions #2268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58a3009
No longer concatenating extensions
TheChymera Oct 31, 2017
19bb33b
Merge remote-tracking branch 'upstream/master' into png
effigies Jan 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion nipype/pipeline/engine/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,7 +1316,8 @@ def export_graph(graph_in,
def format_dot(dotfilename, format='png'):
"""Dump a directed graph (Linux only; install via `brew` on OSX)"""
if format != 'dot':
cmd = 'dot -T%s -O \'%s\'' % (format, dotfilename)
formatted_dotfilename = +'.'+format
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Syntax error here.

cmd = 'dot -T{0} -o"{1}.{0}" "{2}"'.format(format, os.path.splitext(dotfilename)[0], dotfilename)
try:
CommandLine(cmd, resource_monitor=False).run()
except IOError as ioe:
Expand Down
3 changes: 2 additions & 1 deletion tools/interfacedocgen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@ def _write_graph_section(self, fname, title):

fhandle.close()
os.remove(fname)
os.remove(fname + ".png")
bitmap_fname = '{}.png'.format(os.path.splitext(dotfilename)[0])
os.remove(bitmap_fname)
return ad

def generate_api_doc(self, uri):
Expand Down