Changeset 361 for pyyaml/trunk/lib3/yaml/constructor.py

Timestamp:

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

Author:

xi

Message:

Fixed Python 3.1 incompatibility issues.

Files:

• pyyaml/trunk/lib3/yaml/constructor.py (modified) (2 diffs)

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,