Updates from Arfrever2.7.10-02.7.10

3 files changed, 15 insertions, 12 deletions

diff --git a/patches/05_all_loadable_sqlite_extensions.patch b/patches/05_all_loadable_sqlite_extensions.patch
index f7ecefc..e63314f 100644
--- a/patches/05_all_loadable_sqlite_extensions.patch
+++ b/patches/05_all_loadable_sqlite_extensions.patch
@@ -3,7 +3,7 @@ https://bugs.python.org/issue10268
 
 --- configure.ac
 +++ configure.ac
-@@ -2326,6 +2326,15 @@
+@@ -2332,6 +2332,15 @@
    TCLTK_LIBS="$with_tcltk_libs"
  fi
  
diff --git a/patches/23_all_arm_OABI.patch b/patches/23_all_arm_OABI.patch
index 45193a8..70474d7 100644
--- a/patches/23_all_arm_OABI.patch
+++ b/patches/23_all_arm_OABI.patch
@@ -3,7 +3,7 @@ https://bugs.python.org/issue1762561
 
 --- Objects/floatobject.c
 +++ Objects/floatobject.c
-@@ -1849,9 +1849,18 @@
+@@ -1850,9 +1850,18 @@
  /* this is for the benefit of the pack/unpack routines below */
  
  typedef enum {
@@ -23,7 +23,7 @@ https://bugs.python.org/issue1762561
  static float_format_type double_format, float_format;
  static float_format_type detected_double_format, detected_float_format;
  
-@@ -1888,6 +1897,8 @@
+@@ -1889,6 +1898,8 @@
          return PyString_FromString("IEEE, little-endian");
      case ieee_big_endian_format:
          return PyString_FromString("IEEE, big-endian");
@@ -32,7 +32,7 @@ https://bugs.python.org/issue1762561
      default:
          Py_FatalError("insane float_format or double_format");
          return NULL;
-@@ -1901,8 +1912,9 @@
+@@ -1902,8 +1913,9 @@
  "used in Python's test suite.\n"
  "\n"
  "typestr must be 'double' or 'float'.  This function returns whichever of\n"
@@ -44,7 +44,7 @@ https://bugs.python.org/issue1762561
  
  static PyObject *
  float_setformat(PyTypeObject *v, PyObject* args)
-@@ -1940,11 +1952,15 @@
+@@ -1941,11 +1953,15 @@
      else if (strcmp(format, "IEEE, big-endian") == 0) {
          f = ieee_big_endian_format;
      }
@@ -62,7 +62,7 @@ https://bugs.python.org/issue1762561
          return NULL;
  
      }
-@@ -1967,8 +1983,10 @@
+@@ -1968,8 +1984,10 @@
  "used in Python's test suite.\n"
  "\n"
  "typestr must be 'double' or 'float'.  fmt must be one of 'unknown',\n"
@@ -75,7 +75,7 @@ https://bugs.python.org/issue1762561
  "\n"
  "Override the automatic determination of C-level floating point type.\n"
  "This affects how floats are converted to and from binary strings.");
-@@ -2163,7 +2181,11 @@
+@@ -2164,7 +2182,11 @@
         Note that if we're on some whacked-out platform which uses
         IEEE formats but isn't strictly little-endian or big-
         endian, we will fall back to the portable shifts & masks
@@ -88,7 +88,7 @@ https://bugs.python.org/issue1762561
  
  #if SIZEOF_DOUBLE == 8
      {
-@@ -2172,6 +2194,8 @@
+@@ -2173,6 +2195,8 @@
              detected_double_format = ieee_big_endian_format;
          else if (memcmp(&x, "\x05\x04\x03\x02\x01\xff\x3f\x43", 8) == 0)
              detected_double_format = ieee_little_endian_format;
@@ -97,7 +97,7 @@ https://bugs.python.org/issue1762561
          else
              detected_double_format = unknown_format;
      }
-@@ -2517,17 +2541,31 @@
+@@ -2518,17 +2542,31 @@
      }
      else {
          const char *s = (char*)&x;
@@ -137,7 +137,7 @@ https://bugs.python.org/issue1762561
          }
          return 0;
      }
-@@ -2686,22 +2724,33 @@
+@@ -2687,22 +2725,33 @@
      }
      else {
          double x;
diff --git a/patches/24_all_tests_environment.patch b/patches/24_all_tests_environment.patch
index 15dbfdd..8de7cc4 100644
--- a/patches/24_all_tests_environment.patch
+++ b/patches/24_all_tests_environment.patch
@@ -2,7 +2,7 @@ https://bugs.python.org/issue1674555
 
 --- Lib/site.py
 +++ Lib/site.py
-@@ -527,8 +527,9 @@
+@@ -527,8 +527,12 @@
      known_paths = removeduppaths()
      if ENABLE_USER_SITE is None:
          ENABLE_USER_SITE = check_enableusersite()
@@ -11,6 +11,9 @@ https://bugs.python.org/issue1674555
 +    if os.environ.get("_PYTHONNOSITEPACKAGES") is None:
 +        known_paths = addusersitepackages(known_paths)
 +        known_paths = addsitepackages(known_paths)
++    else:
++        # Initialize USER_BASE and USER_SITE.
++        getusersitepackages()
      if sys.platform == 'os2emx':
          setBEGINLIBPATH()
      setquit()
@@ -124,7 +127,7 @@ https://bugs.python.org/issue1674555
              except KeyboardInterrupt:
                  # print a newline separate from the ^C
                  print
-@@ -858,8 +896,9 @@
+@@ -869,8 +907,9 @@
          for name, get, restore in self.resource_info():
              current = get()
              original = saved_values.pop(name)