Misc fixes

.readthedocs.yaml

@@ -12,7 +12,7 @@ build:
       pre_create_environment:
         - |
           PREFIX=$(pwd)/.local
-          ZZ_VERSION=0.8.0
+          ZZ_VERSION=0.9.0a1
           ZZ_DIR=zz-${ZZ_VERSION}
           GITHUB_URL=https://github.com/diofant/zz/releases/download/
           ZZ_URL=${GITHUB_URL}v${ZZ_VERSION}/${ZZ_DIR}.tar.gz

README.rst

@@ -2,7 +2,7 @@ Python-GMP
 ==========
 
 Python extension module, providing bindings to the GNU GMP via the `ZZ library
-<https://github.com/diofant/zz>`_ (version 0.8.0 or later required).  This
+<https://github.com/diofant/zz>`_ (version 0.9.0 or later required).  This
 module shouldn't crash the interpreter.
 
 The gmp can be used as a `gmpy2`_/`python-flint`_ replacement to provide

bench/collatz.py

@@ -8,6 +8,8 @@
     from gmpy2 import mpz
 elif os.getenv("T") == "flint.fmpz":
     from flint import fmpz as mpz
+elif os.getenv("T") == "int":
+    mpz = int
 else:
     from gmp import mpz
 

bench/mul.py

@@ -9,6 +9,8 @@
     from gmpy2 import mpz
 elif os.getenv("T") == "flint.fmpz":
     from flint import fmpz as mpz
+elif os.getenv("T") == "int":
+    mpz = int
 else:
     from gmp import mpz
 

gmp.c

@@ -140,61 +140,12 @@ MPZ_from_str(PyObject *obj, int base)
     if (!str) {
         return NULL; /* LCOV_EXCL_LINE */
     }
-    if (base < 0) {
-        goto bad_base;
-    }
 
     MPZ_Object *res = MPZ_new();
 
     if (!res) {
         return (MPZ_Object *)PyErr_NoMemory(); /* LCOV_EXCL_LINE */
     }
-    while (isspace(*str)) {
-        str++;
-    }
-
-    bool cast_negative = (str[0] == '-');
-
-    str += cast_negative;
-    if (str[0] == '+') {
-        str++;
-    }
-    if (str[0] == '0') {
-        if (base == 0) {
-            if (tolower(str[1]) == 'b') {
-                base = 2;
-            }
-            else if (tolower(str[1]) == 'o') {
-                base = 8;
-            }
-            else if (tolower(str[1]) == 'x') {
-                base = 16;
-            }
-            else if (!isspace(str[1]) && str[1] != '\0') {
-                goto err;
-            }
-        }
-        if ((tolower(str[1]) == 'b' && base == 2)
-            || (tolower(str[1]) == 'o' && base == 8)
-            || (tolower(str[1]) == 'x' && base == 16))
-        {
-            str += 2;
-            if (str[0] == '_') {
-                str++;
-            }
-        }
-        else {
-            goto skip_negation;
-        }
-    }
-    else {
-skip_negation:
-        str -= cast_negative;
-        cast_negative = false;
-    }
-    if (base == 0) {
-        base = 10;
-    }
 
     zz_err ret = zz_set_str(str, base, &res->z);
 
@@ -206,22 +157,17 @@ MPZ_from_str(PyObject *obj, int base)
     }
     else if (ret == ZZ_VAL) {
         Py_DECREF(res);
-        if (2 <= base && base <= 36) {
-err:
+        if (!base || (2 <= base && base <= 36)) {
             PyErr_Format(PyExc_ValueError,
                          "invalid literal for mpz() with base %d: %.200R",
                          base, obj);
         }
         else {
-bad_base:
             PyErr_SetString(PyExc_ValueError,
                             "mpz base must be >= 2 and <= 36, or 0");
         }
         return NULL;
     }
-    if (cast_negative) {
-        (void)zz_neg(&res->z, &res->z);
-    }
     return res;
 }
 

scripts/cibw_before_all.sh

@@ -53,7 +53,7 @@ make --silent all install
 
 cd ..
 
-ZZ_VERSION=0.8.0
+ZZ_VERSION=0.9.0a1
 ZZ_DIR=zz-${ZZ_VERSION}
 ZZ_URL=https://github.com/diofant/zz/releases/download/v${ZZ_VERSION}/${ZZ_DIR}.tar.gz
 

tests/test_mpz.py

@@ -725,17 +725,16 @@ def test_power_errors():
             pow(mpz(1<<64), (1<<31) - 1)
         with pytest.raises(MemoryError):
             pow(mpz(1<<64), (1<<31))
+        with pytest.raises(OverflowError):
+            mpz(1) << ((1 << 63) - 1)
     else:
         with pytest.raises(MemoryError):
             pow(mpz(1<<64), (1<<63) - 1)
         if platform.system() != "Darwin":
             with pytest.raises(MemoryError):
                 pow(mpz(1<<64), (1<<63))
-    with pytest.raises(OverflowError):
-        mpz(1) << ((1 << 64) - 1)
-    if platform.system() != "Darwin":
-        with pytest.raises(MemoryError):
-            mpz(1) << ((1 << 63) - 1)
+        with pytest.raises(OverflowError):
+            mpz(1) << ((1 << 64) - 1)
 
 
 @given(bigints(), integers(max_value=12345))