Mailman 3 December 2021 - Python-checkins

bpo-46085: Fix iterator cache mechanism of OrderedDict. (GH-30290)
by miss-islington Dec. 30, 2021

Dec. 30, 2021

https://github.com/python/cpython/commit/2d4049da1f61df5cb4314d7e10b54fa556… commit: 2d4049da1f61df5cb4314d7e10b54fa556880b0e branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-29T21:29:19-08:00 summary: bpo-46085: Fix iterator cache mechanism of OrderedDict. (GH-30290) (cherry picked from commit fb44d0589615590b1e7895ba78a038e96b15a219) Co-authored-by: Dong-hee Na <donghee.na(a)python.org> files: A Misc/NEWS.d/next/Core and Builtins/2021-12-30-00-23-41.bpo-46085.bDuJqu.rst M Objects/odictobject.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-12-30-00-23-41.bpo-46085.bDuJqu.rst b/Misc/NEWS.d/next/Core and Builtins/2021-12-30-00-23-41.bpo-46085.bDuJqu.rst new file mode 100644 index 0000000000000..a2093f75c3b62 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2021-12-30-00-23-41.bpo-46085.bDuJqu.rst @@ -0,0 +1 @@ +Fix iterator cache mechanism of :class:`OrderedDict`. diff --git a/Objects/odictobject.c b/Objects/odictobject.c index b9f2169a72a8a..f3980aba93776 100644 --- a/Objects/odictobject.c +++ b/Objects/odictobject.c @@ -1290,6 +1290,7 @@ PyDoc_STRVAR(odict_reversed__doc__, "od.__reversed__() <==> reversed(od)"); #define _odict_ITER_REVERSED 1 #define _odict_ITER_KEYS 2 #define _odict_ITER_VALUES 4 +#define _odict_ITER_ITEMS (_odict_ITER_KEYS|_odict_ITER_VALUES) /* forward */ static PyObject * odictiter_new(PyODictObject *, int); @@ -1708,7 +1709,7 @@ odictiter_dealloc(odictiterobject *di) _PyObject_GC_UNTRACK(di); Py_XDECREF(di->di_odict); Py_XDECREF(di->di_current); - if (di->kind & (_odict_ITER_KEYS | _odict_ITER_VALUES)) { + if ((di->kind & _odict_ITER_ITEMS) == _odict_ITER_ITEMS) { Py_DECREF(di->di_result); } PyObject_GC_Del(di); @@ -1914,15 +1915,16 @@ odictiter_new(PyODictObject *od, int kind) if (di == NULL) return NULL; - if (kind & (_odict_ITER_KEYS | _odict_ITER_VALUES)){ + if ((kind & _odict_ITER_ITEMS) == _odict_ITER_ITEMS) { di->di_result = PyTuple_Pack(2, Py_None, Py_None); if (di->di_result == NULL) { Py_DECREF(di); return NULL; } } - else + else { di->di_result = NULL; + } di->kind = kind; node = reversed ? _odict_LAST(od) : _odict_FIRST(od);

1 0

bpo-46085: Fix iterator cache mechanism of OrderedDict. (GH-30290)
by miss-islington Dec. 30, 2021

Dec. 30, 2021

https://github.com/python/cpython/commit/1b37268ef10bd20c30d349b8401c88215c… commit: 1b37268ef10bd20c30d349b8401c88215c8a6be8 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-29T21:29:03-08:00 summary: bpo-46085: Fix iterator cache mechanism of OrderedDict. (GH-30290) (cherry picked from commit fb44d0589615590b1e7895ba78a038e96b15a219) Co-authored-by: Dong-hee Na <donghee.na(a)python.org> files: A Misc/NEWS.d/next/Core and Builtins/2021-12-30-00-23-41.bpo-46085.bDuJqu.rst M Objects/odictobject.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-12-30-00-23-41.bpo-46085.bDuJqu.rst b/Misc/NEWS.d/next/Core and Builtins/2021-12-30-00-23-41.bpo-46085.bDuJqu.rst new file mode 100644 index 0000000000000..a2093f75c3b62 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2021-12-30-00-23-41.bpo-46085.bDuJqu.rst @@ -0,0 +1 @@ +Fix iterator cache mechanism of :class:`OrderedDict`. diff --git a/Objects/odictobject.c b/Objects/odictobject.c index 6c7f1175cd652..c0ccb16bc3d2e 100644 --- a/Objects/odictobject.c +++ b/Objects/odictobject.c @@ -1288,6 +1288,7 @@ PyDoc_STRVAR(odict_reversed__doc__, "od.__reversed__() <==> reversed(od)"); #define _odict_ITER_REVERSED 1 #define _odict_ITER_KEYS 2 #define _odict_ITER_VALUES 4 +#define _odict_ITER_ITEMS (_odict_ITER_KEYS|_odict_ITER_VALUES) /* forward */ static PyObject * odictiter_new(PyODictObject *, int); @@ -1705,7 +1706,7 @@ odictiter_dealloc(odictiterobject *di) _PyObject_GC_UNTRACK(di); Py_XDECREF(di->di_odict); Py_XDECREF(di->di_current); - if (di->kind & (_odict_ITER_KEYS | _odict_ITER_VALUES)) { + if ((di->kind & _odict_ITER_ITEMS) == _odict_ITER_ITEMS) { Py_DECREF(di->di_result); } PyObject_GC_Del(di); @@ -1911,15 +1912,16 @@ odictiter_new(PyODictObject *od, int kind) if (di == NULL) return NULL; - if (kind & (_odict_ITER_KEYS | _odict_ITER_VALUES)){ + if ((kind & _odict_ITER_ITEMS) == _odict_ITER_ITEMS) { di->di_result = PyTuple_Pack(2, Py_None, Py_None); if (di->di_result == NULL) { Py_DECREF(di); return NULL; } } - else + else { di->di_result = NULL; + } di->kind = kind; node = reversed ? _odict_LAST(od) : _odict_FIRST(od);

1 0

bpo-46085: Fix iterator cache mechanism of OrderedDict. (GH-30290)
by corona10 Dec. 30, 2021

Dec. 30, 2021

https://github.com/python/cpython/commit/fb44d0589615590b1e7895ba78a038e96b… commit: fb44d0589615590b1e7895ba78a038e96b15a219 branch: main author: Dong-hee Na <donghee.na(a)python.org> committer: corona10 <donghee.na92(a)gmail.com> date: 2021-12-30T12:35:45+09:00 summary: bpo-46085: Fix iterator cache mechanism of OrderedDict. (GH-30290) files: A Misc/NEWS.d/next/Core and Builtins/2021-12-30-00-23-41.bpo-46085.bDuJqu.rst M Objects/odictobject.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-12-30-00-23-41.bpo-46085.bDuJqu.rst b/Misc/NEWS.d/next/Core and Builtins/2021-12-30-00-23-41.bpo-46085.bDuJqu.rst new file mode 100644 index 0000000000000..a2093f75c3b62 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2021-12-30-00-23-41.bpo-46085.bDuJqu.rst @@ -0,0 +1 @@ +Fix iterator cache mechanism of :class:`OrderedDict`. diff --git a/Objects/odictobject.c b/Objects/odictobject.c index 9af45c685ab3b..e27bcecd75ca3 100644 --- a/Objects/odictobject.c +++ b/Objects/odictobject.c @@ -1249,6 +1249,7 @@ PyDoc_STRVAR(odict_reversed__doc__, "od.__reversed__() <==> reversed(od)"); #define _odict_ITER_REVERSED 1 #define _odict_ITER_KEYS 2 #define _odict_ITER_VALUES 4 +#define _odict_ITER_ITEMS (_odict_ITER_KEYS|_odict_ITER_VALUES) /* forward */ static PyObject * odictiter_new(PyODictObject *, int); @@ -1666,7 +1667,7 @@ odictiter_dealloc(odictiterobject *di) _PyObject_GC_UNTRACK(di); Py_XDECREF(di->di_odict); Py_XDECREF(di->di_current); - if (di->kind & (_odict_ITER_KEYS | _odict_ITER_VALUES)) { + if ((di->kind & _odict_ITER_ITEMS) == _odict_ITER_ITEMS) { Py_DECREF(di->di_result); } PyObject_GC_Del(di); @@ -1872,15 +1873,16 @@ odictiter_new(PyODictObject *od, int kind) if (di == NULL) return NULL; - if (kind & (_odict_ITER_KEYS | _odict_ITER_VALUES)){ + if ((kind & _odict_ITER_ITEMS) == _odict_ITER_ITEMS) { di->di_result = PyTuple_Pack(2, Py_None, Py_None); if (di->di_result == NULL) { Py_DECREF(di); return NULL; } } - else + else { di->di_result = NULL; + } di->kind = kind; node = reversed ? _odict_LAST(od) : _odict_FIRST(od);

1 0

bpo-43424: Deprecate `webbrowser.MacOSXOSAScript._name` attribute (GH-30241)
by corona10 Dec. 30, 2021

Dec. 30, 2021

https://github.com/python/cpython/commit/d12bec69931503be78cd555cf7bc22ad6f… commit: d12bec69931503be78cd555cf7bc22ad6f4f2bd5 branch: main author: Nikita Sobolev <mail(a)sobolevn.me> committer: corona10 <donghee.na92(a)gmail.com> date: 2021-12-30T10:30:13+09:00 summary: bpo-43424: Deprecate `webbrowser.MacOSXOSAScript._name` attribute (GH-30241) files: A Misc/NEWS.d/next/Library/2021-12-23-14-36-58.bpo-43424.d9x2JZ.rst M Doc/library/webbrowser.rst M Lib/test/test_webbrowser.py M Lib/webbrowser.py diff --git a/Doc/library/webbrowser.rst b/Doc/library/webbrowser.rst index 19b3c463bb817..1dc59306164ec 100644 --- a/Doc/library/webbrowser.rst +++ b/Doc/library/webbrowser.rst @@ -197,6 +197,11 @@ Browser controllers provide these methods which parallel three of the module-level convenience functions: +.. attribute:: name + + System-dependent name for the browser. + + .. method:: controller.open(url, new=0, autoraise=True) Display *url* using the browser handled by this controller. If *new* is 1, a new diff --git a/Lib/test/test_webbrowser.py b/Lib/test/test_webbrowser.py index 673cc995d3f5a..dbfd2e5a0f280 100644 --- a/Lib/test/test_webbrowser.py +++ b/Lib/test/test_webbrowser.py @@ -304,7 +304,7 @@ def test_environment(self): webbrowser = import_helper.import_fresh_module('webbrowser') try: browser = webbrowser.get().name - except (webbrowser.Error, AttributeError) as err: + except webbrowser.Error as err: self.skipTest(str(err)) with os_helper.EnvironmentVarGuard() as env: env["BROWSER"] = browser @@ -316,7 +316,7 @@ def test_environment_preferred(self): try: webbrowser.get() least_preferred_browser = webbrowser.get(webbrowser._tryorder[-1]).name - except (webbrowser.Error, AttributeError, IndexError) as err: + except (webbrowser.Error, IndexError) as err: self.skipTest(str(err)) with os_helper.EnvironmentVarGuard() as env: diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py index 3244f206aade6..02d2036906178 100755 --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py @@ -666,19 +666,33 @@ def open(self, url, new=0, autoraise=True): return not rc class MacOSXOSAScript(BaseBrowser): - def __init__(self, name): - self._name = name + def __init__(self, name='default'): + super().__init__(name) + + @property + def _name(self): + warnings.warn(f'{self.__class__.__name__}._name is deprecated in 3.11' + f' use {self.__class__.__name__}.name instead.', + DeprecationWarning, stacklevel=2) + return self.name + + @_name.setter + def _name(self, val): + warnings.warn(f'{self.__class__.__name__}._name is deprecated in 3.11' + f' use {self.__class__.__name__}.name instead.', + DeprecationWarning, stacklevel=2) + self.name = val def open(self, url, new=0, autoraise=True): - if self._name == 'default': + if self.name == 'default': script = 'open location "%s"' % url.replace('"', '%22') # opens in default browser else: - script = ''' + script = f''' tell application "%s" activate open location "%s" end - '''%(self._name, url.replace('"', '%22')) + '''%(self.name, url.replace('"', '%22')) osapipe = os.popen("osascript", "w") if osapipe is None: diff --git a/Misc/NEWS.d/next/Library/2021-12-23-14-36-58.bpo-43424.d9x2JZ.rst b/Misc/NEWS.d/next/Library/2021-12-23-14-36-58.bpo-43424.d9x2JZ.rst new file mode 100644 index 0000000000000..aa5f8d4211c37 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-12-23-14-36-58.bpo-43424.d9x2JZ.rst @@ -0,0 +1 @@ +Deprecate :attr:`webbrowser.MacOSXOSAScript._name` and use ``name`` instead.

1 0

closes bpo-38522 docs: remove references to Py_USING_MEMORY_DEBUGGER (GH-30284) (GH-30295)
by benjaminp Dec. 29, 2021

Dec. 29, 2021

https://github.com/python/cpython/commit/9f0e40fae5191c3e3ed6109bd2e2f97aa0… commit: 9f0e40fae5191c3e3ed6109bd2e2f97aa0ac8d64 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: benjaminp <benjamin(a)locrian.net> date: 2021-12-29T17:01:17-06:00 summary: closes bpo-38522 docs: remove references to Py_USING_MEMORY_DEBUGGER (GH-30284) (GH-30295) (cherry picked from commit 8e11237c5d24e649b26cc928b52bc37f2fde9c7a) Co-authored-by: Carlos Damazio <carlos.damazio(a)damazio.dev> Co-authored-by: Carlos Damazio <carlos.damazio(a)damazio.dev> files: M Misc/README.valgrind diff --git a/Misc/README.valgrind b/Misc/README.valgrind index b483b2ea60a4d..ee9bfdf859d7f 100644 --- a/Misc/README.valgrind +++ b/Misc/README.valgrind @@ -12,12 +12,9 @@ can be used to force the usage of the malloc() allocator of the C library. If you don't want to read about the details of using Valgrind, there are still two things you must do to suppress the warnings. First, you must use a suppressions file. One is supplied in -Misc/valgrind-python.supp. Second, you must do one of the following: - - * Uncomment Py_USING_MEMORY_DEBUGGER in Objects/obmalloc.c, - then rebuild Python - * Uncomment the lines in Misc/valgrind-python.supp that - suppress the warnings for PyObject_Free and PyObject_Realloc +Misc/valgrind-python.supp. Second, you must uncomment the lines in +Misc/valgrind-python.supp that suppress the warnings for PyObject_Free and +PyObject_Realloc. If you want to use Valgrind more effectively and catch even more memory leaks, you will need to configure python --without-pymalloc.

1 0

closes docs: remove references to Py_USING_MEMORY_DEBUGGER (GH-30284)
by miss-islington Dec. 29, 2021

Dec. 29, 2021

https://github.com/python/cpython/commit/864caaabe4264798afd0e9fde0fc875c72… commit: 864caaabe4264798afd0e9fde0fc875c7208429d branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-29T14:47:37-08:00 summary: closes docs: remove references to Py_USING_MEMORY_DEBUGGER (GH-30284) (cherry picked from commit 8e11237c5d24e649b26cc928b52bc37f2fde9c7a) Co-authored-by: Carlos Damazio <carlos.damazio(a)damazio.dev> files: M Misc/README.valgrind diff --git a/Misc/README.valgrind b/Misc/README.valgrind index b483b2ea60a4d..ee9bfdf859d7f 100644 --- a/Misc/README.valgrind +++ b/Misc/README.valgrind @@ -12,12 +12,9 @@ can be used to force the usage of the malloc() allocator of the C library. If you don't want to read about the details of using Valgrind, there are still two things you must do to suppress the warnings. First, you must use a suppressions file. One is supplied in -Misc/valgrind-python.supp. Second, you must do one of the following: - - * Uncomment Py_USING_MEMORY_DEBUGGER in Objects/obmalloc.c, - then rebuild Python - * Uncomment the lines in Misc/valgrind-python.supp that - suppress the warnings for PyObject_Free and PyObject_Realloc +Misc/valgrind-python.supp. Second, you must uncomment the lines in +Misc/valgrind-python.supp that suppress the warnings for PyObject_Free and +PyObject_Realloc. If you want to use Valgrind more effectively and catch even more memory leaks, you will need to configure python --without-pymalloc.

1 0

closes docs: remove references to Py_USING_MEMORY_DEBUGGER (GH-30284)
by benjaminp Dec. 29, 2021

Dec. 29, 2021

https://github.com/python/cpython/commit/8e11237c5d24e649b26cc928b52bc37f2f… commit: 8e11237c5d24e649b26cc928b52bc37f2fde9c7a branch: main author: Carlos Damazio <carlos.damazio(a)damazio.dev> committer: benjaminp <benjamin(a)locrian.net> date: 2021-12-29T16:20:42-06:00 summary: closes docs: remove references to Py_USING_MEMORY_DEBUGGER (GH-30284) files: M Misc/README.valgrind diff --git a/Misc/README.valgrind b/Misc/README.valgrind index b483b2ea60a4d..ee9bfdf859d7f 100644 --- a/Misc/README.valgrind +++ b/Misc/README.valgrind @@ -12,12 +12,9 @@ can be used to force the usage of the malloc() allocator of the C library. If you don't want to read about the details of using Valgrind, there are still two things you must do to suppress the warnings. First, you must use a suppressions file. One is supplied in -Misc/valgrind-python.supp. Second, you must do one of the following: - - * Uncomment Py_USING_MEMORY_DEBUGGER in Objects/obmalloc.c, - then rebuild Python - * Uncomment the lines in Misc/valgrind-python.supp that - suppress the warnings for PyObject_Free and PyObject_Realloc +Misc/valgrind-python.supp. Second, you must uncomment the lines in +Misc/valgrind-python.supp that suppress the warnings for PyObject_Free and +PyObject_Realloc. If you want to use Valgrind more effectively and catch even more memory leaks, you will need to configure python --without-pymalloc.

1 0

[3.10] bpo-46185: Fix wrong version ref. in macOS installer ReadMe (GH-30280)
by ambv Dec. 29, 2021

Dec. 29, 2021

https://github.com/python/cpython/commit/c31fdef1e71ff1598f213b1b4ad1a565e4… commit: c31fdef1e71ff1598f213b1b4ad1a565e47d7864 branch: 3.10 author: Erlend Egeberg Aasland <erlend.aasland(a)innova.no> committer: ambv <lukasz(a)langa.pl> date: 2021-12-29T20:40:11+01:00 summary: [3.10] bpo-46185: Fix wrong version ref. in macOS installer ReadMe (GH-30280) files: M Mac/BuildScript/resources/ReadMe.rtf diff --git a/Mac/BuildScript/resources/ReadMe.rtf b/Mac/BuildScript/resources/ReadMe.rtf index 7934dd1a4bea5..4edfa5f3069f4 100644 --- a/Mac/BuildScript/resources/ReadMe.rtf +++ b/Mac/BuildScript/resources/ReadMe.rtf @@ -20,7 +20,7 @@ This package includes its own private copy of OpenSSL 1.1.1. The trust certifi \f0\i0 command line utility are not used as defaults by the Python \f3 ssl \f0 module. A sample command script is included in -\f3 /Applications/Python 3.9 +\f3 /Applications/Python 3.10 \f0 to install a curated bundle of default root certificates from the third-party \f3 certifi \f0 package ({\field{\*\fldinst{HYPERLINK "https://pypi.org/project/certifi/"}}{\fldrslt https://pypi.org/project/certifi/}}). Double-click on

1 0

bpo-46185: Fix wrong version ref. in macOS installer ReadMe (GH-30278)
by ambv Dec. 29, 2021

Dec. 29, 2021

https://github.com/python/cpython/commit/bc87ac6d0b13116f525215f8a31b46506b… commit: bc87ac6d0b13116f525215f8a31b46506bc8d629 branch: main author: Erlend Egeberg Aasland <erlend.aasland(a)innova.no> committer: ambv <lukasz(a)langa.pl> date: 2021-12-29T20:39:49+01:00 summary: bpo-46185: Fix wrong version ref. in macOS installer ReadMe (GH-30278) files: M Mac/BuildScript/resources/ReadMe.rtf diff --git a/Mac/BuildScript/resources/ReadMe.rtf b/Mac/BuildScript/resources/ReadMe.rtf index 2a954083bf127..8d699395f304c 100644 --- a/Mac/BuildScript/resources/ReadMe.rtf +++ b/Mac/BuildScript/resources/ReadMe.rtf @@ -26,7 +26,7 @@ This package includes its own private copy of OpenSSL 1.1.1. The trust certifi \f0\i0 command line utility are not used as defaults by the Python \f3 ssl \f0 module. A sample command script is included in -\f3 /Applications/Python 3.9 +\f3 /Applications/Python 3.11 \f0 to install a curated bundle of default root certificates from the third-party \f3 certifi \f0 package ({\field{\*\fldinst{HYPERLINK "https://pypi.org/project/certifi/"}}{\fldrslt https://pypi.org/project/certifi/}}). Double-click on

1 0

bpo-46176: mmap module adding MAP_STACK constant. (GH-30252)
by corona10 Dec. 29, 2021

Dec. 29, 2021

https://github.com/python/cpython/commit/66c47b63a0df3143fe48d6efc1183eecda… commit: 66c47b63a0df3143fe48d6efc1183eecda2a363d branch: main author: David CARLIER <devnexen(a)gmail.com> committer: corona10 <donghee.na92(a)gmail.com> date: 2021-12-29T22:52:29+09:00 summary: bpo-46176: mmap module adding MAP_STACK constant. (GH-30252) files: A Misc/NEWS.d/next/Library/2021-12-25-11-11-21.bpo-46176.EOY9wd.rst M Doc/library/mmap.rst M Modules/mmapmodule.c diff --git a/Doc/library/mmap.rst b/Doc/library/mmap.rst index c1ebd80abd977..d19580cd7ee5c 100644 --- a/Doc/library/mmap.rst +++ b/Doc/library/mmap.rst @@ -367,8 +367,12 @@ MAP_* Constants MAP_ANON MAP_ANONYMOUS MAP_POPULATE + MAP_STACK These are the various flags that can be passed to :meth:`mmap.mmap`. Note that some options might not be present on some systems. .. versionchanged:: 3.10 Added MAP_POPULATE constant. + + .. versionadded:: 3.11 + Added MAP_STACK constant. diff --git a/Misc/NEWS.d/next/Library/2021-12-25-11-11-21.bpo-46176.EOY9wd.rst b/Misc/NEWS.d/next/Library/2021-12-25-11-11-21.bpo-46176.EOY9wd.rst new file mode 100644 index 0000000000000..4a50c2617200e --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-12-25-11-11-21.bpo-46176.EOY9wd.rst @@ -0,0 +1 @@ +Adding the ``MAP_STACK`` constant for the mmap module. \ No newline at end of file diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index 399cb0a99ad65..742bcb3d145fa 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -1637,6 +1637,11 @@ mmap_exec(PyObject *module) #endif #ifdef MAP_POPULATE ADD_INT_MACRO(module, MAP_POPULATE); +#endif +#ifdef MAP_STACK + // Mostly a no-op on Linux and NetBSD, but useful on OpenBSD + // for stack usage (even on x86 arch) + ADD_INT_MACRO(module, MAP_STACK); #endif if (PyModule_AddIntConstant(module, "PAGESIZE", (long)my_getpagesize()) < 0 ) { return -1;

1 0