[yeb] YAML format for ebfiles_repo#1822
Merged
boegel merged 23 commits intoeasybuilders:developfrom Jul 8, 2016
Merged
Conversation
| YAML_DIR = r'%YAML' | ||
| YAML_SEP = '---' | ||
| YEB_FORMAT_EXTENSION = '.yeb' | ||
| EB_FORMAT_EXTENSION = '.eb' |
Member
There was a problem hiding this comment.
this belongs in format/one.py since it has nothing to do with the .yeb format?
Member
|
@Caylo you should look into a test for this too, i.e. build & install toy easyconfig, and check whether the dumped easyconfig can be parsed again, both for |
| if set(YAML_SPECIAL_CHARS).intersection(val): | ||
| return "'%s'" % val | ||
|
|
||
| return val |
Member
| """ | ||
| if isinstance(val, basestring): | ||
| if YAML_SPECIAL_CHARS.intersection(val): | ||
| return "'%s'" % val |
Member
There was a problem hiding this comment.
don't return inline, it makes code harder to read
so, do something like
if if isinstance(val, basestring) and YAML_SPECIAL_CHARS.intersection(val):
val = "'%s'" % val
return val
Member
|
@Caylo still a broken test: |
| """ | ||
| if isinstance(val, basestring): | ||
| if "'" in val: | ||
| val = '"%s"' % val |
| val = '"%s"' % val | ||
|
|
||
| elif YAML_SPECIAL_CHARS.intersection(val): | ||
| val = "'%s'" % val |
Member
There was a problem hiding this comment.
@Caylo shouldn't this be the first option you try?
if the string includes both ' and any special YAML charachter, you'll still be in trouble since then you'll take the first option which quotes with "..." but doesn't escape YAML chars?
Contributor
Author
There was a problem hiding this comment.
@boegel YAML special chars are escaped by quoting the string (as YAML doesn't usually require quoting for regular strings). If the string contains both ' and any other special char, the string will be quoted with ".." anyway, so special chars don't matter anymore
now that im typing this, maybe a better solution is to add ' to YAML_SPECIAL_CHARS and always escape with double quotes
Member
There was a problem hiding this comment.
Wait, but there was a difference between single-quoting and double-quoted strings in YAML, right?
Include a comment and reference w.r.t. that in this function please...
| if isinstance(val, basestring): | ||
| if "'" in val or YAML_SPECIAL_CHARS.intersection(val): | ||
| val = val.replace("'", "''") | ||
| val = "'%s'" % val |
Member
There was a problem hiding this comment.
this looks a bit silly, let's collapse it to
val = "'%s'" % val.replace("'", "''")
Member
|
Going in, thanks @Caylo! |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #1695
Includes
#1826