Fix sre_compile._bytes_to_code

coolreader18 · coolreader18 · commit 8746f29d3b37 · 2019-10-02T22:09:31.000-05:00
diff --git a/Lib/sre_compile.py b/Lib/sre_compile.py
@@ -380,7 +380,9 @@ def _mk_bitmap(bits, _CODEBITS=_CODEBITS, _int=int):
 
 def _bytes_to_codes(b):
     # Convert block indices to word array
-    a = memoryview(b).cast('I')
+    import array
+    a = array.array('I')
+    a.frombytes(bytes(b))
     assert a.itemsize == _sre.CODESIZE
     assert len(a) * a.itemsize == len(b)
     return a.tolist()
diff --git a/Lib/textwrap.py b/Lib/textwrap.py
@@ -113,7 +113,7 @@ class TextWrapper:
     sentence_end_re = re.compile(r'[a-z]'             # lowercase letter
                                  r'[\.!\?]'          # sentence-ending punct.
                                  r'["\']?'           # optional end-of-quote
-                                 r'\z')               # end of chunk
+                                 r'\Z')               # end of chunk
 
     def __init__(self,
                  width=70,
diff --git a/vm/src/stdlib/array.rs b/vm/src/stdlib/array.rs
@@ -165,10 +165,10 @@ def_array_enum!(
     // TODO: support unicode char
     (SignedShort, i16, 'h'),
     (UnsignedShort, u16, 'H'),
-    (SignedInt, i16, 'i'),
-    (UnsignedInt, u16, 'I'),
-    (SignedLong, i32, 'l'),
-    (UnsignedLong, u32, 'L'),
+    (SignedInt, i32, 'i'),
+    (UnsignedInt, u32, 'I'),
+    (SignedLong, i64, 'l'),
+    (UnsignedLong, u64, 'L'),
     (SignedLongLong, i64, 'q'),
     (UnsignedLongLong, u64, 'Q'),
     (Float, f32, 'f'),
@@ -305,6 +305,16 @@ impl PyArray {
         self.array.borrow().tobytes()
     }
 
+    #[pymethod]
+    fn tolist(&self, vm: &VirtualMachine) -> PyResult {
+        let array = self.array.borrow();
+        let mut v = Vec::with_capacity(array.len());
+        for obj in array.iter(vm) {
+            v.push(obj?);
+        }
+        Ok(vm.ctx.new_list(v))
+    }
+
     #[pymethod]
     fn reverse(&self, _vm: &VirtualMachine) {
         self.array.borrow_mut().reverse()
@@ -338,6 +348,11 @@ impl PyArray {
         }
     }
 
+    #[pymethod(name = "__len__")]
+    fn len(&self, _vm: &VirtualMachine) -> usize {
+        self.array.borrow().len()
+    }
+
     #[pymethod(name = "__iter__")]
     fn iter(zelf: PyRef<Self>, _vm: &VirtualMachine) -> PyArrayIter {
         PyArrayIter {
