Merge pull request RustPython#1891 from RustPython/coolreader18/fix-codec-tests

Fix a few codecs tests

Author: youknowone

Lib/_codecs.py

@@ -115,7 +115,7 @@ def encode(v, encoding=None, errors='strict'):
     if not isinstance(errors, str):
         raise TypeError("Errors must be a string")
     codec = lookup(encoding)
-    res = codec.encode(v, errors)
+    res = codec[0](v, errors)
     if not isinstance(res, tuple) or len(res) != 2:
         raise TypeError("encoder must return a tuple (object, integer)")
     return res[0]
@@ -137,7 +137,7 @@ def decode(obj, encoding=None, errors='strict'):
     if not isinstance(errors, str):
         raise TypeError("Errors must be a string")
     codec = lookup(encoding)
-    res = codec.decode(obj, errors)
+    res = codec[1](obj, errors)
     if not isinstance(res, tuple) or len(res) != 2:
         raise TypeError("encoder must return a tuple (object, integer)")
     return res[0]
@@ -1347,7 +1347,7 @@ def unicode_encode_ucs1(p, size, errors, limit):
             while collend < len(p) and ord(p[collend]) >= limit:
                 collend += 1
             x = unicode_call_errorhandler(errors, encoding, reason, p, collstart, collend, False)
-            res += str(x[0])
+            res += x[0].encode()
             pos = x[1]
 
     return res
@@ -1406,8 +1406,8 @@ def PyUnicode_DecodeUnicodeEscape(s, size, errors):
     pos = 0
     while (pos < size): 
 ##        /* Non-escape characters are interpreted as Unicode ordinals */
-        if (s[pos] != '\\') :
-            p += chr(ord(s[pos]))
+        if (chr(s[pos]) != '\\') :
+            p += chr(s[pos])
             pos += 1
             continue
 ##        /* \ - Escapes */
@@ -1416,7 +1416,7 @@ def PyUnicode_DecodeUnicodeEscape(s, size, errors):
             if pos >= len(s):
                 errmessage = "\\ at end of string"
                 unicode_call_errorhandler(errors, "unicodeescape", errmessage, s, pos-1, size)
-            ch = s[pos]
+            ch = chr(s[pos])
             pos += 1
     ##        /* \x escapes */
             if ch == '\\'  : p += '\\'
@@ -1469,24 +1469,24 @@ def PyUnicode_DecodeUnicodeEscape(s, size, errors):
 ##        /* \N{name} */
             elif ch == 'N':
                 message = "malformed \\N character escape"
-                #pos += 1
+                # pos += 1
                 look = pos
                 try:
                     import unicodedata
                 except ImportError:
                     message = "\\N escapes not supported (can't load unicodedata module)"
                     unicode_call_errorhandler(errors, "unicodeescape", message, s, pos-1, size)
-                if look < size and s[look] == '{':
+                if look < size and chr(s[look]) == '{':
                     #/* look for the closing brace */
-                    while (look < size and s[look] != '}'):
+                    while (look < size and chr(s[look]) != '}'):
                         look += 1
-                    if (look > pos+1 and look < size and s[look] == '}'):
+                    if (look > pos+1 and look < size and chr(s[look]) == '}'):
                         #/* found a name.  look it up in the unicode database */
                         message = "unknown Unicode character name"
                         st = s[pos+1:look]
                         try:
                             chr = unicodedata.lookup("%s" % st)
-                        except KeyError as e:
+                        except LookupError as e:
                             x = unicode_call_errorhandler(errors, "unicodeescape", message, s, pos-1, look+1)
                         else:
                             x = chr, look + 1 

Lib/test/test_unicode.py

@@ -2123,8 +2123,6 @@ def test_codecs_idna(self):
         # Test whether trailing dot is preserved
         self.assertEqual("www.python.org.".encode("idna"), b"www.python.org.")
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_codecs_errors(self):
         # Error handling (encoding)
         self.assertRaises(UnicodeError, 'Andr\202 x'.encode, 'ascii')

vm/src/obj/objfloat.rs

@@ -651,7 +651,14 @@ fn to_float(vm: &VirtualMachine, obj: &PyObjectRef) -> PyResult<f64> {
             }
         }
     } else {
-        return Err(vm.new_type_error(format!("can't convert {} to float", obj.class().name)));
+        let method = vm.get_method_or_type_error(obj.clone(), "__float__", || {
+            format!(
+                "float() argument must be a string or a number, not '{}'",
+                obj.class().name
+            )
+        })?;
+        let result = vm.invoke(&method, vec![])?;
+        PyFloatRef::try_from_object(vm, result)?.to_f64()
     };
     Ok(value)
 }
@@ -712,21 +719,6 @@ pub fn get_value(obj: &PyObjectRef) -> f64 {
     obj.payload::<PyFloat>().unwrap().value
 }
 
-fn make_float(vm: &VirtualMachine, obj: &PyObjectRef) -> PyResult<f64> {
-    if let Some(float) = obj.payload_if_subclass::<PyFloat>(vm) {
-        Ok(float.value)
-    } else {
-        let method = vm.get_method_or_type_error(obj.clone(), "__float__", || {
-            format!(
-                "float() argument must be a string or a number, not '{}'",
-                obj.class().name
-            )
-        })?;
-        let result = vm.invoke(&method, vec![])?;
-        Ok(get_value(&result))
-    }
-}
-
 #[derive(Debug, Copy, Clone, PartialEq)]
 pub struct IntoPyFloat {
     value: f64,
@@ -741,7 +733,7 @@ impl IntoPyFloat {
 impl TryFromObject for IntoPyFloat {
     fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {
         Ok(IntoPyFloat {
-            value: make_float(vm, &obj)?,
+            value: to_float(vm, &obj)?,
         })
     }
 }

vm/src/obj/objstr.rs

@@ -1173,13 +1173,8 @@ impl PyString {
     }
 
     #[pymethod]
-    fn encode(
-        zelf: PyRef<Self>,
-        encoding: OptionalArg<PyStringRef>,
-        errors: OptionalArg<PyStringRef>,
-        vm: &VirtualMachine,
-    ) -> PyResult<PyBytesRef> {
-        encode_string(zelf, encoding.into_option(), errors.into_option(), vm)
+    fn encode(zelf: PyRef<Self>, args: EncodeArgs, vm: &VirtualMachine) -> PyResult<PyBytesRef> {
+        encode_string(zelf, args.encoding, args.errors, vm)
     }
 
     #[pymethod(magic)]
@@ -1201,6 +1196,14 @@ impl PyString {
     }
 }
 
+#[derive(FromArgs)]
+struct EncodeArgs {
+    #[pyarg(positional_or_keyword, default = "None")]
+    encoding: Option<PyStringRef>,
+    #[pyarg(positional_or_keyword, default = "None")]
+    errors: Option<PyStringRef>,
+}
+
 pub(crate) fn encode_string(
     s: PyStringRef,
     encoding: Option<PyStringRef>,