Changeset 361 for pyyaml/trunk/lib3/yaml

Timestamp:

08/30/09 15:32:07 (3 years ago)

Author:

xi

Message:

Fixed Python 3.1 incompatibility issues.

Location:

pyyaml/trunk/lib3/yaml

Files:

• constructor.py (modified) (2 diffs)
• reader.py (modified) (1 diff)
• representer.py (modified) (1 diff)

pyyaml/trunk/lib3/yaml/constructor.py

@@ -286 +286 @@
                     node.start_mark)
         try:
-            return base64.decodestring(value)
+            if hasattr(base64, 'decodebytes'):
+                return base64.decodebytes(value)
+            else:
+                return base64.decodestring(value)
         except binascii.Error as exc:
             raise ConstructorError(None, None,
@@ -478 +481 @@
                     node.start_mark)
         try:
-            return base64.decodestring(value)
+            if hasattr(base64, 'decodebytes'):
+                return base64.decodebytes(value)
+            else:
+                return base64.decodestring(value)
         except binascii.Error as exc:
             raise ConstructorError(None, None,

pyyaml/trunk/lib3/yaml/reader.py

@@ -157 +157 @@
                             'strict', self.eof)
                 except UnicodeDecodeError as exc:
-                    character = exc.object[exc.start]
+                    character = self.raw_buffer[exc.start]
                     if self.stream is not None:
                         position = self.stream_pointer-len(self.raw_buffer)+exc.start

pyyaml/trunk/lib3/yaml/representer.py

@@ -145 +145 @@
 
     def represent_binary(self, data):
-        data = base64.encodestring(data).decode('ascii')
+        if hasattr(base64, 'encodebytes'):
+            data = base64.encodebytes(data).decode('ascii')
+        else:
+            data = base64.encodestring(data).decode('ascii')
         return self.represent_scalar('tag:yaml.org,2002:binary', data, style='|')