Index: branches/pyyaml3000/lib/yaml/reader.py
===================================================================
--- branches/pyyaml3000/lib/yaml/reader.py	(revision 48)
+++ branches/pyyaml3000/lib/yaml/reader.py	(revision 52)
@@ -16,7 +16,7 @@
 #   reader.line, stream.column - the line and the column of the current character.
 
-__all__ = ['Marker', 'Reader', 'ReaderError']
-
-from error import YAMLError
+__all__ = ['Reader', 'ReaderError']
+
+from error import YAMLError, Marker
 
 import codecs, re
@@ -56,44 +56,4 @@
                 data = data[:-count-1]
         return codecs.utf_8_decode(data, errors)
-
-class Marker:
-
-    def __init__(self, name, line, column, buffer, pointer):
-        self.name = name
-        self.line = line
-        self.column = column
-        self.buffer = buffer
-        self.pointer = pointer
-
-    def get_snippet(self, indent=4, max_length=75):
-        if self.buffer is None:
-            return None
-        head = ''
-        start = self.pointer
-        while start > 0 and self.buffer[start-1] not in u'\0\r\n\x85\u2028\u2029':
-            start -= 1
-            if self.pointer-start > max_length/2-1:
-                head = ' ... '
-                start += 5
-                break
-        tail = ''
-        end = self.pointer
-        while end < len(self.buffer) and self.buffer[end] not in u'\0\r\n\x85\u2028\u2029':
-            end += 1
-            if end-self.pointer > max_length/2-1:
-                tail = ' ... '
-                end -= 5
-                break
-        snippet = self.buffer[start:end].encode('utf-8')
-        return ' '*indent + head + snippet + tail + '\n'  \
-                + ' '*(indent+self.pointer-start+len(head)) + '^'
-
-    def __str__(self):
-        snippet = self.get_snippet()
-        where = "  in \"%s\", line %d, column %d"   \
-                % (self.name, self.line+1, self.column+1)
-        if snippet is not None:
-            where += ":\n"+snippet
-        return where
 
 class ReaderError(YAMLError):