tyler.durden
/
test262
mirror of https://github.com/tc39/test262.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #314 from arv/fix-yaml-carriage-return 

Fix monkey yaml's handling of carriage return
This commit is contained in:
Brian Terlson 2015-06-11 12:06:10 -04:00
parent 36cbdcf8ec be26179719
commit 488c0a71ce
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/packaging/monkeyYaml.py
View File

@ -16,7 +16,7 @@ mYamlMultilineList = re.compile(r"^ *- (.*)$")
def load(str): def load(str):
dict = None dict = None
lines = str.split("\n") lines = str.splitlines()
while lines: while lines:
line = lines.pop(0) line = lines.pop(0)
if myIsAllSpaces(line): if myIsAllSpaces(line):

4
tools/packaging/test/test_monkeyYaml.py
View File

@ -106,6 +106,10 @@ class TestMonkeyYAMLParsing(unittest.TestCase):
self.assertEqual(lines, ["baz: bletch"]) self.assertEqual(lines, ["baz: bletch"])
self.assertEqual(value, ["foo", "bar"]) self.assertEqual(value, ["foo", "bar"])
def test_multiline_list_carriage_return(self):
y = "foo:\r\n - bar\r\n - baz"
self.assertEqual(monkeyYaml.load(y), yaml.load(y))
def test_oneline_indented(self): def test_oneline_indented(self):
y = " foo: bar\n baz: baf\n" y = " foo: bar\n baz: baf\n"
self.assertEqual(monkeyYaml.load(y), yaml.load(y)) self.assertEqual(monkeyYaml.load(y), yaml.load(y))