Fix some misc issues in _io/_codecs

coolreader18 · coolreader18 · commit 1c47b6300521 · 2020-04-11T16:40:28.000-05:00
diff --git a/vm/Lib/python_builtins/_codecs.py b/vm/Lib/python_builtins/_codecs.py
@@ -1528,11 +1528,11 @@ def charmapencode_output(c, mapping):
     rep = mapping[c]
     if isinstance(rep, int) or isinstance(rep, int):
         if rep < 256:
-            return chr(rep)
+            return rep
         else:
             raise TypeError("character mapping must be in range(256)")
     elif isinstance(rep, str):
-        return rep
+        return ord(rep)
     elif rep == None:
         raise KeyError("character maps to <undefined>")
     else:
@@ -1582,7 +1582,7 @@ def PyUnicode_DecodeCharmap(s, size, mapping, errors):
         #/* Get mapping (char ordinal -> integer, Unicode char or None) */
         ch = s[inpos]
         try:
-            x = mapping[ord(ch)]
+            x = mapping[ch]
             if isinstance(x, int):
                 if x < 65536:
                     p += chr(x)
diff --git a/vm/Lib/python_builtins/_io.py b/vm/Lib/python_builtins/_io.py
@@ -1507,19 +1507,24 @@ def __init__(self, file, mode='r', closefd=True, opener=None):
                     os.set_inheritable(fd, False)
 
             self._closefd = closefd
-            fdfstat = os.fstat(fd)
             try:
-                if stat.S_ISDIR(fdfstat.st_mode):
-                    raise IsADirectoryError(errno.EISDIR,
-                                            os.strerror(errno.EISDIR), file)
-            except AttributeError:
-                # Ignore the AttribueError if stat.S_ISDIR or errno.EISDIR
-                # don't exist.
-                pass
-            self._blksize = getattr(fdfstat, 'st_blksize', 0)
-            if self._blksize <= 1:
-                self._blksize = DEFAULT_BUFFER_SIZE
+                fdfstat = os.fstat(fd)
+            except OSError:
+                fdfstat = None
+            else:
+                try:
+                    if stat.S_ISDIR(fdfstat.st_mode):
+                        raise IsADirectoryError(errno.EISDIR,
+                                                os.strerror(errno.EISDIR), file)
+                except AttributeError:
+                    # Ignore the AttribueError if stat.S_ISDIR or errno.EISDIR
+                    # don't exist.
+                    pass
+                self._blksize = getattr(fdfstat, 'st_blksize', 0)
+                if self._blksize <= 1:
+                    self._blksize = DEFAULT_BUFFER_SIZE
 
+            # XXX RustPython TODO: fix _setmode here
             if _setmode and False:
                 # don't translate newlines (\r\n <=> \n)
                 _setmode(fd, os.O_BINARY)
