Skip to content
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.

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

Options for multiple paths #997

Merged
merged 7 commits into from
Dec 1, 2016
Merged

Options for multiple paths #997

merged 7 commits into from
Dec 1, 2016

Conversation

mrksr
Copy link
Contributor

@mrksr mrksr commented Nov 30, 2016

This implements issue #995. I have not yet tested the PR with python 2.
I'm very interested in your thoughts concerning coding style, since I have tried to follow your lead.

for pathspec in pathspecs:
if pathspec not in parse:
parse[pathspec] = {}
cls._update_options(parse[pathspec], options)
Copy link
Contributor

@jlstevens jlstevens Nov 30, 2016

Choose a reason for hiding this comment

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

Perhaps something like:

parse[pathspec] = merged_options(parse.get(pathspec, {}), options)

would be nicer?



@classmethod
def _update_options(cls, old_opts, new_opts):
Copy link
Contributor

Choose a reason for hiding this comment

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

As a last comment, maybe this should be called _merge_options as it now creates a new dictionary instead of updating an existing one?

@jlstevens
Copy link
Contributor

Looks great, thanks for the contribution and thanks for all the new unit tests!

You have already addressed most of my comments and I am ready to merge once you address my latest suggestion (renaming _update_options). The tests are passing so I think it looks good to go!

@mrksr
Copy link
Contributor Author

mrksr commented Nov 30, 2016

Will do. Thank you for your guidance :-)

@mrksr
Copy link
Contributor Author

mrksr commented Dec 1, 2016

Rename should be done now and I added one more test to reflect our decision on precedence in merges.

I had to replace the commits with new author information which includes my private mail, so do not be confused that everything is new.

@jlstevens
Copy link
Contributor

All looks good so I am now merging. Thanks once again for contributing!

@jlstevens jlstevens merged commit 69406c5 into holoviz:master Dec 1, 2016
@philippjfr philippjfr added this to the v1.7.0 milestone Dec 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants