Changeset 149

Timestamp:

04/23/06 09:40:57 (7 years ago)

Author:

xi

Message:

Raise an error for colons in the flow context.

Location:

pyyaml/trunk

Files:

• README (modified) (1 diff)
• lib/yaml/scanner.py (modified) (1 diff)
• tests/data/colon-in-flow-context.loader-error (added)

pyyaml/trunk/README

@@ -1 @@
-PyYAML3000 - The next generation YAML parser for Python.
+PyYAML 3000 - The next generation YAML parser and emitter for Python.
 
 To install, type 'python setup.py install'.
 
-For more information, check 'http://pyyaml.org/wiki/PyYAML'.
+For more information, check the PyYAML homepage:
+'http://pyyaml.org/wiki/PyYAML'.
 
 Post your questions and opinions to the YAML-Core mailing list:
 'http://lists.sourceforge.net/lists/listinfo/yaml-core'.
 
-PyYAML3000 is written by Kirill Simonov <xi@resolvent.net>. It is released
+Submit bug reports and feature requests to the PyYAML bug tracker:
+'http://pyyaml.org/newticket?component=pyyaml'.
+
+PyYAML 3000 is written by Kirill Simonov <xi@resolvent.net>. It is released
 under the MIT license. See the file LICENSE for more details.

pyyaml/trunk/lib/yaml/scanner.py

@@ -1302 +1302 @@
                     break
                 length += 1
+            # It's not clear what we should do with ':' in the flow context.
+            if (self.flow_level and ch == u':'
+                    and self.peek(length+1) not in u'\0 \t\r\n\x28\u2028\u2029,[]{}'):
+                self.forward(length)
+                raise ScannerError("while scanning a plain scalar", start_mark,
+                    "found unexpected ':'", self.get_mark(),
+                    "Please check http://pyyaml.org/wiki/YAMLColonInFlowContext for details.")
             if length == 0:
                 break