Index: branches/pyyaml3000/lib/yaml/marker.py
===================================================================
--- branches/pyyaml3000/lib/yaml/marker.py	(revision 39)
+++ branches/pyyaml3000/lib/yaml/marker.py	(revision 43)
@@ -2,9 +2,9 @@
 class Marker:
 
-    def __init__(self, source, data, index, row, column):
+    def __init__(self, source, data, index, line, column):
         self.source = source
         self.data = data
         self.index = index
-        self.row = row
+        self.line = line
         self.column = column