Index: /pyyaml/trunk/README
===================================================================
--- /pyyaml/trunk/README	(revision 128)
+++ /pyyaml/trunk/README	(revision 149)
@@ -1,11 +1,15 @@
-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.
Index: /pyyaml/trunk/tests/data/colon-in-flow-context.loader-error
===================================================================
--- /pyyaml/trunk/tests/data/colon-in-flow-context.loader-error	(revision 149)
+++ /pyyaml/trunk/tests/data/colon-in-flow-context.loader-error	(revision 149)
@@ -0,0 +1,1 @@
+{ foo:bar }
Index: /pyyaml/trunk/lib/yaml/scanner.py
===================================================================
--- /pyyaml/trunk/lib/yaml/scanner.py	(revision 138)
+++ /pyyaml/trunk/lib/yaml/scanner.py	(revision 149)
@@ -1302,4 +1302,11 @@
                     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