Revert "Merge pull request RustPython#2106 from RustPython/coolreader18/unittest-tests"

This reverts commit 96926da, reversing
changes made to 230f915.

Author: youknowone

Lib/_codecs.py

@@ -1610,29 +1610,29 @@ def PyUnicode_DecodeRawUnicodeEscape(s, size, errors):
     while (pos < len(s)):
         ch = s[pos]
     #/* Non-escape characters are interpreted as Unicode ordinals */
-        if (ch != ord('\\')):
-            p.append(chr(ch))
+        if (ch != '\\'):
+            p += chr(ord(ch))
             pos += 1
             continue        
         startinpos = pos
 ##      /* \u-escapes are only interpreted iff the number of leading
 ##         backslashes is odd */
         bs = pos
         while pos < size:
-            if (s[pos] != ord('\\')):
+            if (s[pos] != '\\'):
                 break
-            p.append(chr(s[pos]))
+            p += chr(ord(s[pos]))
             pos += 1
 
         if (((pos - bs) & 1) == 0 or
             pos >= size or
-            (s[pos] != ord('u') and s[pos] != ord('U'))) :
-            p.append(chr(s[pos]))
+            (s[pos] != 'u' and s[pos] != 'U')) :
+            p += chr(ord(s[pos]))
             pos += 1
             continue
 
         p.pop(-1)
-        if s[pos] == ord('u'):
+        if s[pos] == 'u':
             count = 4 
         else: 
             count = 8
@@ -1646,7 +1646,7 @@ def PyUnicode_DecodeRawUnicodeEscape(s, size, errors):
             res = unicode_call_errorhandler(
                     errors, "rawunicodeescape", "truncated \\uXXXX",
                     s, size, pos, pos+count)
-            p.append(res[0])
+            p += res[0]
             pos = res[1]
         else:
     #ifndef Py_UNICODE_WIDE
@@ -1656,21 +1656,21 @@ def PyUnicode_DecodeRawUnicodeEscape(s, size, errors):
                         errors, "rawunicodeescape", "\\Uxxxxxxxx out of range",
                         s, size, pos, pos+1)
                     pos = res[1]
-                    p.append(res[0])
+                    p += res[0]
                 else:
-                    p.append(chr(x))
+                    p += chr(x)
                     pos += count
             else:
                 if (x > 0x10000):
                     res = unicode_call_errorhandler(
                         errors, "rawunicodeescape", "\\Uxxxxxxxx out of range",
                         s, size, pos, pos+1)
                     pos = res[1]
-                    p.append(res[0])
+                    p += res[0]
 
     #endif
                 else:
-                    p.append(chr(x))
+                    p += chr(x)
                     pos += count
 
     return p

Lib/pickle.py

@@ -201,10 +201,7 @@ def commit_frame(self, force=False):
         if self.current_frame:
             f = self.current_frame
             if f.tell() >= self._FRAME_SIZE_TARGET or force:
-                # XXX RUSTPYTHON TODO: memoryview + BytesIO.getbuffer()
-                # with f.getbuffer() as data:
-                data = f.getvalue()
-                if True:
+                with f.getbuffer() as data:
                     n = len(data)
                     write = self.file_write
                     write(FRAME)