Changeset 136 for pyyaml/trunk/lib/yaml/reader.py

Timestamp:

04/15/06 19:54:52 (7 years ago)

Author:

xi

Message:

Major refactoring.

File:

• pyyaml/trunk/lib/yaml/reader.py (modified) (2 diffs)

pyyaml/trunk/lib/yaml/reader.py

@@ -92 +92 @@
     # Yeah, it's ugly and slow.
 
-    def __init__(self, data):
+    def __init__(self, stream):
         self.name = None
         self.stream = None
@@ -105 +105 @@
         self.line = 0
         self.column = 0
-        if isinstance(data, unicode):
+        if isinstance(stream, unicode):
             self.name = "<unicode string>"
-            self.check_printable(data)
-            self.buffer = data+u'\0'
-        elif isinstance(data, str):
+            self.check_printable(stream)
+            self.buffer = stream+u'\0'
+        elif isinstance(stream, str):
             self.name = "<string>"
-            self.raw_buffer = data
+            self.raw_buffer = stream
             self.determine_encoding()
         else:
-            self.stream = data
-            self.name = getattr(data, 'name', "<file>")
+            self.stream = stream
+            self.name = getattr(stream, 'name', "<file>")
             self.eof = False
             self.raw_buffer = ''