Kirill Simonov avatar Kirill Simonov committed 5d287df

Fixed Python 3.1 incompatibility issues.

Comments (0)

Files changed (4)

             raise MemoryError
         self.stream = stream
         self.dump_unicode = 0
-        try:
-            if stream.encoding:
+        if PY_MAJOR_VERSION < 3:
+            if hasattr(stream, 'encoding'):
                 self.dump_unicode = 1
-        except AttributeError:
-            pass
+        else:
+            if hasattr(stream, u'encoding'):
+                self.dump_unicode = 1
         self.use_encoding = encoding
         yaml_emitter_set_output(&self.emitter, output_handler, <void *>self)    
         if canonical:

lib3/yaml/constructor.py

                     "failed to convert base64 data into ascii: %s" % exc,
                     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,
                     "failed to decode base64 data: %s" % exc, node.start_mark)
                     "failed to convert base64 data into ascii: %s" % exc,
                     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,
                     "failed to decode base64 data: %s" % exc, node.start_mark)

lib3/yaml/reader.py

                     data, converted = self.raw_decode(self.raw_buffer,
                             '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
                     else:

lib3/yaml/representer.py

         return self.represent_scalar('tag:yaml.org,2002:str', data)
 
     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='|')
 
     def represent_bool(self, data):
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.