merge py3.8 into the releaserelease-pypy3.8-v7.3.10rc2release-pypy3.8-v7.3.10rc1

5 files changed, 46 insertions, 18 deletions

diff --git a/LICENSE b/LICENSE
index cb7f7fd534..de9db6536e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -78,6 +78,7 @@ copyrighted by one or more of the following people and organizations:
   Romain Guillebert
   Ronny Pfannschmidt
   Justin Peel
+  Yusuke Izawa
   Raffael Tfirst
   David Edelsohn
   Anders Hammarquist
@@ -85,23 +86,22 @@ copyrighted by one or more of the following people and organizations:
   Gregor Wegberg
   Guido Wesdorp
   Lawrence Oluyede
-  Bartosz Skowron
   Stefano Rivera
+  Bartosz Skowron
   Daniel Roberts
   Adrien Di Mascio
   Niko Matsakis
+  Batuhan Taskaya
   Alexander Hesse
   Ludovic Aubry
-  Batuhan Taskaya
   stian
   Jacob Hallen
   Jason Creighton
   Mark Young
   Andrew Lawrence
-  Alex Martelli
   Ondrej Baranovič
+  Alex Martelli
   Spenser Bauman
-  Yusuke Izawa
   Michal Bendowski
   Jan de Mooij
   Stefan Beyer
@@ -132,8 +132,8 @@ copyrighted by one or more of the following people and organizations:
   Konstantin Lopuhin
   Wenzhu Man
   John Witulski
-  Jeremy Thurgood
   Julian Berman
+  Jeremy Thurgood
   Adrian Kuhn
   Dario Bertini
   Greg Price
@@ -147,6 +147,7 @@ copyrighted by one or more of the following people and organizations:
   Pavel Vinogradov
   William Leslie
   Paweł Piotr Przeradowski
+  Michał Górny
   Paul deGrandis
   Ilya Osadchiy
   Tobias Oberstein
@@ -156,8 +157,8 @@ copyrighted by one or more of the following people and organizations:
   Taavi Burns
   Joannah Nanjekye
   Georg Brandl
-  Michał Górny
   quejebo
+  Tadeu Zagallo
   Vanessa Freudenberg
   Gerald Klix
   Wanja Saatkamp
@@ -179,6 +180,7 @@ copyrighted by one or more of the following people and organizations:
   Lukas Renggli
   Dusty Phillips
   Guenter Jantzen
+  Nils Müller
   Amit Regmi
   Ned Batchelder
   Jasper Schulz
@@ -218,7 +220,6 @@ copyrighted by one or more of the following people and organizations:
   Aaron Iles
   Christian Hudon
   Daniel Patrick
-  Ricky Zhou
   Justas Sadzevicius
   Gasper Zejn
   Neil Shepperd
@@ -228,6 +229,7 @@ copyrighted by one or more of the following people and organizations:
   Berkin Ilbeyi
   Mihnea Saracin
   Matt Jackson
+  Ricky Zhou
   Jonathan David Riehl
   Anders Qvist
   Beatrice During
@@ -283,6 +285,7 @@ copyrighted by one or more of the following people and organizations:
   Thomas Hisch
   Barry Hart
   Tomasz Dziopa
+  Wenzel Jakob
   Lutz Paelike
   Ignas Mikalajunas
   Martin Blais
@@ -312,8 +315,10 @@ copyrighted by one or more of the following people and organizations:
   Antoine Dupre
   Bernd Schoeller
   Catalin Fierut
+  Chris Burr
   nimaje
   Pierre-Yves DAVID
+  Alessandro Ogier
   Gustavo Niemeyer
   Andrew Thompson
   Joshua Gilbert
@@ -371,6 +376,7 @@ copyrighted by one or more of the following people and organizations:
   Dennis Sweeney
   Kevin Lee
   h-vertini
+  Maxwell Bernstein
   Anna Ravencroft
   Dinu Gherman
   Michael Chermside
@@ -473,7 +479,6 @@ copyrighted by one or more of the following people and organizations:
   shaolo1
   Chris AtLee
   Christoph Reiter
-  Chris Burr
   Brad Kish
   Michael Cho
   Ian Clester
diff --git a/lib-python/3/warnings.py b/lib-python/3/warnings.py
index 691ccddfa4..758ec97f71 100644
--- a/lib-python/3/warnings.py
+++ b/lib-python/3/warnings.py
@@ -532,6 +532,10 @@ except ImportError:
         _filters_version += 1
 
     _warnings_defaults = False
+else:
+    # the del is for pypy's celldict: make the globals "never mutated" ones
+    del warn, warn_explicit
+    from _warnings import (warn, warn_explicit)
 
 
 # Module initialization
diff --git a/pypy/doc/contributor.rst b/pypy/doc/contributor.rst
index 3b7e80597e..f49cbdcca6 100644
--- a/pypy/doc/contributor.rst
+++ b/pypy/doc/contributor.rst
@@ -44,6 +44,7 @@ Contributors
   Romain Guillebert
   Ronny Pfannschmidt
   Justin Peel
+  Yusuke Izawa
   Raffael Tfirst
   David Edelsohn
   Anders Hammarquist
@@ -51,23 +52,22 @@ Contributors
   Gregor Wegberg
   Guido Wesdorp
   Lawrence Oluyede
-  Bartosz Skowron
   Stefano Rivera
+  Bartosz Skowron
   Daniel Roberts
   Adrien Di Mascio
   Niko Matsakis
+  Batuhan Taskaya
   Alexander Hesse
   Ludovic Aubry
-  Batuhan Taskaya
   stian
   Jacob Hallen
   Jason Creighton
   Mark Young
   Andrew Lawrence
-  Alex Martelli
   Ondrej Baranovič
+  Alex Martelli
   Spenser Bauman
-  Yusuke Izawa
   Michal Bendowski
   Jan de Mooij
   Stefan Beyer
@@ -98,8 +98,8 @@ Contributors
   Konstantin Lopuhin
   Wenzhu Man
   John Witulski
-  Jeremy Thurgood
   Julian Berman
+  Jeremy Thurgood
   Adrian Kuhn
   Dario Bertini
   Greg Price
@@ -113,6 +113,7 @@ Contributors
   Pavel Vinogradov
   William Leslie
   Paweł Piotr Przeradowski
+  Michał Górny
   Paul deGrandis
   Ilya Osadchiy
   Tobias Oberstein
@@ -122,8 +123,8 @@ Contributors
   Taavi Burns
   Joannah Nanjekye
   Georg Brandl
-  Michał Górny
   quejebo
+  Tadeu Zagallo
   Vanessa Freudenberg
   Gerald Klix
   Wanja Saatkamp
@@ -145,6 +146,7 @@ Contributors
   Lukas Renggli
   Dusty Phillips
   Guenter Jantzen
+  Nils Müller
   Amit Regmi
   Ned Batchelder
   Jasper Schulz
@@ -184,7 +186,6 @@ Contributors
   Aaron Iles
   Christian Hudon
   Daniel Patrick
-  Ricky Zhou
   Justas Sadzevicius
   Gasper Zejn
   Neil Shepperd
@@ -194,6 +195,7 @@ Contributors
   Berkin Ilbeyi
   Mihnea Saracin
   Matt Jackson
+  Ricky Zhou
   Jonathan David Riehl
   Anders Qvist
   Beatrice During
@@ -249,6 +251,7 @@ Contributors
   Thomas Hisch
   Barry Hart
   Tomasz Dziopa
+  Wenzel Jakob
   Lutz Paelike
   Ignas Mikalajunas
   Martin Blais
@@ -278,8 +281,10 @@ Contributors
   Antoine Dupre
   Bernd Schoeller
   Catalin Fierut
+  Chris Burr
   nimaje
   Pierre-Yves DAVID
+  Alessandro Ogier
   Gustavo Niemeyer
   Andrew Thompson
   Joshua Gilbert
@@ -337,6 +342,7 @@ Contributors
   Dennis Sweeney
   Kevin Lee
   h-vertini
+  Maxwell Bernstein
   Anna Ravencroft
   Dinu Gherman
   Michael Chermside
@@ -439,7 +445,6 @@ Contributors
   shaolo1
   Chris AtLee
   Christoph Reiter
-  Chris Burr
   Brad Kish
   Michael Cho
   Ian Clester
diff --git a/pypy/doc/tool/makecontributor.py b/pypy/doc/tool/makecontributor.py
index b318770132..7c22a10d5f 100644
--- a/pypy/doc/tool/makecontributor.py
+++ b/pypy/doc/tool/makecontributor.py
@@ -3,7 +3,11 @@ from __future__ import print_function
 # NOTE: run this script with LANG=en_US.UTF-8
 # works with pip install mercurial==3.0
 
-import py
+try:
+    from pathlib import Path
+except ImportError:
+    import py
+    Path = py.path.local
 import sys
 from collections import defaultdict
 import operator
@@ -11,7 +15,7 @@ import re
 import mercurial.hg
 import mercurial.ui
 
-ROOT = py.path.local(__file__).join('..', '..', '..', '..')
+ROOT = Path(__file__, '..', '..', '..', '..')
 author_re = re.compile('(.*) <.*>')
 pair_programming_re = re.compile(r'^\((.*?)\)')
 excluded = set(["pypy", "convert-repo", "hgattic", '"Miss Islington (bot)"'])
@@ -100,6 +104,7 @@ alias = {
     'David Malcolm': ['dmalcolm'],
     'Simon Cross': ['hodgestar'],
     'Łukasz Langa': ['ambv'],
+    'Wenzel Jakob': ['Jakob Wenzel'],
     }
 
 alias_map = {}
diff --git a/pypy/module/_warnings/test/test_warnings.py b/pypy/module/_warnings/test/test_warnings.py
new file mode 100644
index 0000000000..af7d9f488f
--- /dev/null
+++ b/pypy/module/_warnings/test/test_warnings.py
@@ -0,0 +1,9 @@
+def test_warn_globals_immutable(space):
+    w_import = space.builtin.getdictvalue(space, '__import__')
+    w_warnings = space.call_function(w_import, space.newtext("warnings"))
+    # the test fails if the following line returns an ObjectMutableCell (which
+    # has no .name)
+    w_warn = w_warnings.w_dict.dstorage._x['warn']
+    assert w_warn.name == 'warn'
+    w_warn_explicit = w_warnings.w_dict.dstorage._x['warn_explicit']
+    assert w_warn_explicit.name == 'warn_explicit'